qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
41,756 Commits 68 Branches 268 Tags 806 MiB
Commit Graph

263 Commits

Author SHA1 Message Date
Tobias Hunger 9162aa5da9 CMake: pro2cmake: fix include file handling 
Do not include the same file over and over again...

Change-Id: Ia0748b9ebe58388549ba23ec7e24ce3d9b738987
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-01-18 08:50:40 +00:00
Tobias Hunger 6a1ee4de07 CMake: Store Qt features in CMake Cache 
This is less self-contained than what we have, but significantly speeds
up cmake configure/generate runs.

This patch also warns when a feature is already defined.

Change-Id: I8cab63e208ba98756b47d362a39b462f5ec55e20
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-01-17 16:16:55 +00:00
Tobias Hunger 54d372ea67 pro2cmake: Clean up linter and pypi issues 
Also remove one stray line of debug output

Change-Id: If3d2e0b31e5e1b1c05c321d63e8762b23f55bb66
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-01-07 09:37:43 +00:00
Tobias Hunger 19874e2381 pro2cmake: Be more faithful in the representation of operations 
Do a better approximation of =, +=, *= and -=.

Change-Id: I94765532f278deaac330b27cd5a3f41f319c6477
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2018-12-21 10:24:12 +00:00
Tobias Hunger f0aa8fa48e pro2cmake: Handle VPATH 
Change-Id: Ia72f55489129c50ca730c42b75bbc2bda926b82f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2018-12-21 10:24:01 +00:00
Tobias Hunger 4769830034 pro2cmake.py: Do not try to add libraries that qmake substracts 
Add a comment that a library was removed when running into "QT -= gui"
and similar lines.

Change-Id: I17b7922827f228c6b45e1e6867fdc5e316af3781
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2018-11-05 15:45:39 +00:00
Tobias Hunger da7811dc75 pro2cmake: Explicitly handle for loops 
Handle for loops by ignoring them:-)

Change-Id: If4716e0615f4a0fa982281b94dbd4f70ae868fd8
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2018-11-05 14:58:38 +00:00
Tobias Hunger ead9c0b1b8 pro2cmake: Handle Statements before Scopes 
This fixes among other things the unit tests.

Change-Id: If9e23735d1d52cf49dc1f03749129fd726e8dea5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2018-11-05 14:58:12 +00:00
Tobias Hunger 187c466d9a pro2cmake.py: Improve debugging off included files 
Change-Id: I1007a5134a3d3e9ca7e5d3cd9b23ad64f76602be
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2018-11-05 14:57:48 +00:00
Tobias Hunger 41eabf01c4 pro2cmake.py: Make handling of TEMPLATE more robust 
Change-Id: I43b6dac3984b66585408c9fb91ae28c5b134fe40
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2018-11-05 14:57:40 +00:00
Tobias Hunger 96ddd79b03 CMake: Handle '-' better in pro2cmake 
Do not fail on tests/benchmarks/benchmark.pro.

Change-Id: I0ffdf9d38ea6fa73856f33d44c5a428c9cab9107
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2018-11-05 14:56:23 +00:00
Tobias Hunger f3cf1a6856 CMake: Improve handling of qtHaveModule in pro2cmake script 
Map "qtHaveModule(foo)" in qmake to "TARGET Qt::Foo" in cmake.

Change-Id: I63c251f0f2dfd2e95adc996a83b528e9b4e9636e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2018-11-05 14:55:59 +00:00
Simon Hausmann e9c45bbddd Begin port of qtbase to CMake 
Done-by: Alexandru Croitor <alexandru.croitor@qt.io>
Done-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Done-by: Kevin Funk <kevin.funk@kdab.com>
Done-by: Mikhail Svetkin <mikhail.svetkin@qt.io>
Done-by: Simon Hausmann <simon.hausmann@qt.io>
Done-by: Tobias Hunger <tobias.hunger@qt.io>
Done-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Done-by: Volker Krause <volker.krause@kdab.com>
Change-Id: Ida4f8bd190f9a4849a1af7b5b7981337a5df5310
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Mikhail Svetkin <mikhail.svetkin@qt.io>
 2018-11-01 11:48:46 +00:00