Go to file
Alexandru Croitor 4dfb1eca1e Fix qmake builds
We did some changes in the .cpp files of some tests when converting
the build system to CMake, but didn't adjust the .pro files which
caused tests to fail when doing a qmake build.

Make the required changes. Was discovered when doing a test
wip/cmake -> dev merge.

Change-Id: I407a982412cb44df592a38a4cb997968bdfe3304
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-12-11 20:57:54 +00:00
bin Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake 2019-10-11 16:23:19 +02:00
cmake Expose Patch Version in QtConfig.cmake 2019-12-11 15:46:08 +00:00
coin Make standalone tests build via top level repo project 2019-11-08 15:42:32 +00:00
config.tests Add initial support for cross-building to iOS 2019-12-03 13:35:59 +00:00
dist Merge remote-tracking branch 'origin/5.12' into 5.13 2019-09-08 11:33:28 +02:00
doc Merge remote-tracking branch 'origin/dev' into wip/cmake 2019-11-19 13:53:21 +01:00
examples Merge remote-tracking branch 'origin/dev' into wip/cmake 2019-11-19 13:53:21 +01:00
lib
mkspecs Merge remote-tracking branch 'origin/5.15' into dev 2019-11-01 01:01:02 +01:00
qmake Remove superfluous qt_internal_add_target_aliases call 2019-12-11 11:21:05 +00:00
src Collect Json Metatypes from CMake's Automoc 2019-12-04 10:48:06 +00:00
tests Fix qmake builds 2019-12-11 20:57:54 +00:00
util Add library mappings for QtAxContainer and QtWekKitWidgets 2019-12-11 11:33:01 +00:00
.gitattributes
.gitignore Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake 2019-07-11 17:17:51 +02:00
.qmake.conf Merge remote-tracking branch 'origin/dev' into wip/qt6 2019-09-04 14:33:40 +02:00
.tag
CMakeLists.txt Collect Json Metatypes from CMake's Automoc 2019-12-04 10:48:06 +00:00
config_help.txt Remove leftovers from QML1 2019-10-10 11:28:19 +02:00
configure Prospective fix for Boot2Qt build in the CI 2019-10-18 13:21:29 +00:00
configure.bat Configure: simplify logic 2019-03-14 12:13:58 +00:00
configure.cmake Regenerate configure.json files after changes 2019-12-03 13:38:08 +00:00
configure.json Merge remote-tracking branch 'origin/dev' into wip/cmake 2019-10-14 17:46:34 +02:00
configure.pri Merge remote-tracking branch 'origin/5.15' into dev 2019-11-01 01:01:02 +01:00
dependencies.yaml Re-add dependencies.yaml so repos outside qt5 can be built with Coin 2019-09-19 17:07:36 +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 INSTALL: Remove outdated reference to Windows CE 2019-02-13 13:01:57 +00:00
LICENSE.FDL
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 Make QList an alias to QVector 2019-10-30 11:52:48 +01:00