Go to file
Tobias Hunger 0a9e5e139a CMake: pro2cmake.py: Fix handling of complex else branches
Return the current scope's condition, not the total condition from
recursive_evaluate_scope. That is the part the "else" referrs to.

The parent_condition stays identical for all branches, so that should
not get negated.

Change-Id: I0da91483d4d748d01a29ac16890d709d8d659843
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-01-29 09:01:07 +00:00
bin syncqt: fix forwarding injected headers, take ~3 2018-09-12 06:53:02 +00:00
cmake CMake: Store Qt features in CMake Cache 2019-01-17 16:16:55 +00:00
config.tests AVX512 test: an intrinsic that GCC forgot to implement prior to GCC8 2018-09-15 20:55:25 +00:00
dist add buildsystem+qmake changelog 2018-09-13 04:25:10 +00:00
doc CMake: Introduce Q_OBJECT qdoc macro 2019-01-25 14:33:26 +00:00
examples CMake: Use AUTOMOC/AUTOUIC/AUTORCC 2018-12-14 14:04:59 +00:00
lib Purge all fonts 2015-08-18 19:59:14 +00:00
mkspecs Merge remote-tracking branch 'origin/5.12' into dev 2018-10-13 00:07:20 +02:00
qmake Begin port of qtbase to CMake 2018-11-01 11:48:46 +00:00
src CMake: Introduce Q_OBJECT qdoc macro 2019-01-25 14:33:26 +00:00
tests CMake: Store Qt features in CMake Cache 2019-01-17 16:16:55 +00:00
util CMake: pro2cmake.py: Fix handling of complex else branches 2019-01-29 09:01:07 +00:00
.gitattributes Update the git-archive export options 2012-09-07 15:39:31 +02:00
.gitignore Begin port of qtbase to CMake 2018-11-01 11:48:46 +00:00
.qmake.conf Bump version 2018-10-11 12:59:42 +02:00
.tag Update the git-archive export options 2012-09-07 15:39:31 +02:00
CMakeLists.txt CMake: Add "BUILD_EXAMPLES" option to disable examples 2019-01-17 16:17:42 +00:00
config_help.txt Make the use of -fdata-sections and --gc-sections more generic in Qt 2018-04-27 06:47:35 +00:00
configure configure: Treat win32-clang-g++ the same as win32-g++ 2018-10-10 04:10:40 +00:00
configure.bat configure: Prefer cl.exe over clang-cl.exe 2018-01-04 21:22:42 +00:00
configure.cmake CMake: Replace QT_FEATURE_shared with BUILD_SHARED_LIBS 2018-11-06 15:23:52 +00:00
configure.json Begin port of qtbase to CMake 2018-11-01 11:48:46 +00:00
configure.pri Report compiler and version in configure overview 2018-10-12 13:24:19 +00:00
header.BSD Use placeholder for year in header.* files 2018-04-16 11:02:22 +00:00
header.COMM Use placeholder for year in header.* files 2018-04-16 11:02:22 +00:00
header.FDL Use placeholder for year in header.* files 2018-04-16 11:02:22 +00:00
header.GPL Use placeholder for year in header.* files 2018-04-16 11:02:22 +00:00
header.GPL-EXCEPT Use placeholder for year in header.* files 2018-04-16 11:02:22 +00:00
header.LGPL Use placeholder for year in header.* files 2018-04-16 11:02:22 +00:00
header.LGPL3 Use placeholder for year in header.* files 2018-04-16 11:02:22 +00:00
header.LGPL3-COMM Use placeholder for year in header.* files 2018-04-16 11:02:22 +00:00
header.LGPL-NOGPL2 Use placeholder for year in header.* files 2018-04-16 11:02:22 +00:00
header.LGPL-ONLY Use placeholder for year in header.* files 2018-04-16 11:02:22 +00:00
header.MIT qsimd: add support for new x86 CPU features 2018-05-05 06:20:07 +00:00
INSTALL Doc: Update links in INSTALL file 2015-02-16 09:06:41 +00:00
LICENSE.FDL Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
LICENSE.GPL2 Add new license header templates and license files 2016-01-14 20:43:46 +00:00
LICENSE.GPL3 Add new license header templates and license files 2016-01-14 20:43:46 +00:00
LICENSE.GPL3-EXCEPT Add new license header templates and license files 2016-01-14 20:43:46 +00:00
LICENSE.LGPL3 Add new license header templates and license files 2016-01-14 20:43:46 +00:00
LICENSE.LGPLv3 Remove LICENSE.GPLv3, LICENSE.LGPLv21, LGPL_EXCEPTION.txt 2018-04-16 11:02:14 +00:00
LICENSE.QT-LICENSE-AGREEMENT-4.0 Replace commercial preview license with Qt License Agreement 4.0 2018-06-21 11:39:15 +00:00
qtbase.pro nuke configure -host-option 2016-12-13 18:55:59 +00:00
sync.profile Testlib: Rename qtest_global.h to qttestglobal.h 2018-03-21 10:31:01 +00:00