diff options
author | The Qt Project <gerrit-noreply@qt-project.org> | 2019-11-25 14:49:13 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-11-25 14:49:13 +0000 |
commit | bc1cae774ad8cc084a98cb37d363770efbde025c (patch) | |
tree | aeb16a5fa9093632eba6143fe53ef1dad3e383a4 /tests/manual/widgets | |
parent | 8d35ad8726f44c4e853b5a192203ffcbbd2476e1 (diff) | |
parent | 26e876912435bdafbca2b425af43824d7ec5b876 (diff) |
Merge "Merge remote-tracking branch 'origin/dev' into wip/cmake" into wip/cmake
Diffstat (limited to 'tests/manual/widgets')
-rw-r--r-- | tests/manual/widgets/styles/styles.pro | 3 | ||||
-rw-r--r-- | tests/manual/widgets/widgets.pro | 3 | ||||
-rw-r--r-- | tests/manual/widgets/widgets/bigmenucreator/bigmenucreator.pro | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/tests/manual/widgets/styles/styles.pro b/tests/manual/widgets/styles/styles.pro index 68980ae867..1830e21705 100644 --- a/tests/manual/widgets/styles/styles.pro +++ b/tests/manual/widgets/styles/styles.pro @@ -1,5 +1,6 @@ TEMPLATE = app -QT = tst_manual_widgets +QT = widgets +TARGET = tst_manual_styles CONFIG += cmdline CONFIG += c++11 diff --git a/tests/manual/widgets/widgets.pro b/tests/manual/widgets/widgets.pro index e3942a49e9..03aaa880b8 100644 --- a/tests/manual/widgets/widgets.pro +++ b/tests/manual/widgets/widgets.pro @@ -1,3 +1,2 @@ TEMPLATE = subdirs -SUBDIRS = itemviews qgraphicsview kernel widgets -greaterThan(QT_MAJOR_VERSION, 4): SUBDIRS += styles +SUBDIRS = itemviews qgraphicsview kernel widgets styles diff --git a/tests/manual/widgets/widgets/bigmenucreator/bigmenucreator.pro b/tests/manual/widgets/widgets/bigmenucreator/bigmenucreator.pro index 69fbea3834..408dab6482 100644 --- a/tests/manual/widgets/widgets/bigmenucreator/bigmenucreator.pro +++ b/tests/manual/widgets/widgets/bigmenucreator/bigmenucreator.pro @@ -4,9 +4,7 @@ # #------------------------------------------------- -QT += core gui - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets +QT += core gui widgets TARGET = BigMenuCreator TEMPLATE = app |