Commit Graph

55 Commits

Author SHA1 Message Date
Mickaël Schoentgen 412a9b819e Fix all DeprecationWarning: invalid escape sequence
Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr>
2019-01-05 12:02:42 +01:00
Mark Flanagan 5faa15a9f3 Don't quote or escape arg file lines for moc/rcc
Qt parses each argument line-by-line. Avoiding the quoting and escaping
from Task.quote_flag saves us from "too many files specified" moc/rcc error.
2018-05-17 00:00:49 +02:00
Thomas Nagy facdc0b173
Python 3.7 fixes #2126 2018-03-12 20:42:55 +01:00
Thomas Nagy d21446ff71
Update docs for 2018 2018-01-01 20:53:49 +01:00
fedepell 7d00ca7266 qt5: make also uic->h conversion parallel safe, assuming that all transformations are equal 2017-11-03 20:49:49 +01:00
Thomas Nagy 230096c378
Remove extra parenthesis in qt5.py 2017-10-23 13:59:20 +02:00
fedepell f5aa701f1f qt5: resolve concurrency issues when files such as qm and qrc are used by multiple build tasks 2017-10-23 13:51:45 +02:00
Thomas Nagy ad5dd18408
Use the 'with' syntax whenever possible 2017-09-12 19:36:43 +02:00
fedepell 44a9a1f026 qt5: minor correction of uic tool search error message (wrong versions printed) 2017-08-01 22:41:45 +02:00
Sean Fisk 2c4ff3e28b Docs: Avoid Qt re-builds by sorting set of includes
Because Python's set type is unordered, storing include paths in it
can produce unnecessary re-builds by generating different compiler
command lines between successive builds. Avoid this by using the
sorted() function on the includes.

The documentation for Python ≥ 2.7 guarantees that sorted() is stable,
while for Python 2.5–2.6 it uses the same algorithm as list.sort(),
which is stable [1].

[1]: https://stackoverflow.com/a/1915418
2017-07-06 07:47:48 +02:00
Thomas Nagy e5e8397154 Change producer.outstanding.appendleft to producer.outstanding.append 2017-06-14 19:53:01 +02:00
Thomas Nagy fbdc9fd5a3
Code simplifications 2017-04-22 22:12:11 +02:00
Thomas Nagy 5ac6123e5e
Cleanup: Break multiple statements on multiple lines 2017-04-17 13:16:57 +02:00
Thomas Nagy a26236da2a
Improve Qt detection with frameworks 2017-03-25 12:51:53 +01:00
Thomas Nagy 1c3c49d0fb
Simplify task.inputs/task.outputs usage 2017-02-19 11:05:44 +01:00
Alexander Afanasyev acd41beef1 qt5: Workaround for QT5 detection on macOS (Bug #1910) 2017-02-15 18:36:20 +01:00
Thomas Nagy b7d93c3c4d
Update the year in headers to 2017 2017-02-11 16:13:37 +01:00
Thomas Nagy f2eaf17089
Disable the detection of Qt debug libraries 2017-01-28 11:50:41 +01:00
Thomas Nagy ee2c5865f9
Simplify the Qt5 library detection 2017-01-28 11:41:07 +01:00
fedepell ed3b943803 qt5: generate the list of Qt5 libraries by searching on the system, instead of hardcoded list in tool
This gives the possibility to search on the system (QT5_LIBDIR or library automatically
found) for libraries available instead of using the list hardcoded in the tool. The search is
done using a regexp that matches the same files as the ones used for library search with support
for dynamic/static and win32/unix.

This change makes the tool more versatile to new versions of Qt5 as we don't have to maintain the
library list anymore. It should also make configure faster as just the libraries phisically present
will be tested upon. Custom libraries installed on top of base Qt5 will be also recognized with this
method.
2017-01-24 18:26:45 +01:00
Federico Pellegrin ed55a0c9ea Remove .so extension from detected qt5 library (#1892) 2017-01-11 21:30:41 +01:00
fedepell 2128ce1bc1 qt5: add --qtextralibs option to add qt5 custom libraries on the system to the default libraries list present in the qt5 tool
example usages:
waf configure --qtextralibs Qt5OpcUA
waf configure --qtextralibs Qt5OpcUA,Qt5Dummy
2017-01-11 08:07:49 +01:00
Federico Pellegrin 627cdb705d Add qt5 5.8.x new libraries to qt5 tool (#1888) 2017-01-05 19:33:02 +01:00
fedepell df3b886067 If compiler_cxx was not configured before qt5 then qt5 will try to build applications with an empty compiler which gives very strange errors in the config log. Just check if the compiler is not there and remember the user that compiler_cxx should be configured before qt5. 2016-09-19 17:17:39 +02:00
fedepell 40dafce024 Add qt5 5.7.x new libraries to qt5 tool 2016-09-15 14:40:24 +02:00
Thomas Nagy 1721a505d9
Use the new syntax for sets 2016-09-02 20:20:43 +02:00
fedepell a9bb62b3f6 qt5: qt5 5.7 detection, added also case with std=c++11 but no fPIC/fPIE 2016-08-19 06:59:40 +02:00
Thomas Nagy adea933f1a
Qt 5.7 -std=c++11 #1798 2016-08-18 22:21:35 +02:00
Thomas Nagy ef0cf35cb1
Force qt5 static library detection for #1588
Use: 'QT5_XCOMPILE=1 QT5_FORCE_STATIC=1 waf configure'
2016-07-17 15:19:06 +02:00
Thomas Nagy ff1be31ec4
Fix Qt5 detection when pkg-config is missing 2016-06-26 12:06:17 +02:00
Thomas Nagy 50ae7dc3ba
Api docs 2016-06-26 11:59:27 +02:00
Thomas Nagy 850e9ad5fc
Simplify env['FOO'] -> env.FOO 2016-06-25 23:54:12 +02:00
Thomas Nagy ef48d49260
Remove update_outputs from the documentation 2016-06-25 22:48:47 +02:00
fedepell 585bc1e9a8 qt5: uic generation task, use node.parent insted of self.path otherwise the path gets lost and all ui_XXX.h get generated on top level build directory which may also
lead to name clashes
2016-06-22 14:07:10 +02:00
Thomas Nagy 2f03b76833
Qt5 may require -fPIC 2016-06-20 20:24:37 +02:00
fedepell 32bd21a77f qt5: Fix usage examples as libraries in qt5 are named QT5XXX and not QTXXX as in qt4 (ie. QT5WIDGETS instead of QTWIDGETS) 2016-06-05 22:10:38 +02:00
Thomas Nagy 441ed98a3d
Better error messages in Qt5 2016-05-09 22:33:01 +02:00
Thomas Nagy b70692dbb3
Add a configuration test to add /usr/local/lib in linkflags on FreeBSD 2016-05-01 17:03:55 +02:00
Thomas Nagy 568cd6881d
Set the Qt5 search path on FreeBSD 2016-05-01 16:21:23 +02:00
Thomas Nagy e7aa8349be
Changed the moc_foo.cpp file name to moc_foo.n.cpp to protect against name clashes 2016-05-01 14:49:55 +02:00
Thomas Nagy ae8253f571
Process Qt files according to the Qt documentation 2016-05-01 14:21:46 +02:00
Thomas Nagy 6b2e837bc2
Issue 1726 2016-05-01 13:21:06 +02:00
Thomas Nagy 8520dd65bb
Code cleanup 2016-04-19 22:00:21 +02:00
Thomas Nagy 8717fa791f
outstanding.insert -> outstanding.append_left 2016-03-31 07:42:08 +02:00
Thomas Nagy e66cf563ce
Uninitialized variables when qt options are not used 2015-11-16 19:30:07 +01:00
Dale Stewart 1bc6c745c9 qt5: cope with library names like 'Qt5Core' instead of 'QtCore5', as in Qt 5.4 on Windows 2015-05-14 16:15:57 -05:00
Thomas Nagy 6d674de8c9
qt5 detection improvements 2015-01-06 11:18:28 +01:00
Thomas Nagy e297881d30
Missing method in qt5.py 2014-10-25 13:50:23 +02:00
Thomas Nagy d24092184a
Issue 1502 - too much caching in qt logic 2014-10-25 13:39:22 +02:00
Syl 76731c8155 qt5: added Qt5WinExtras 2014-07-14 22:27:40 +02:00