1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update version checks in tests/manual

Browse Source 
Remove unnecessary version in tests/manual since they are always true in
the CMake port where it's impossible to have a QtVersion less than 6.0.

Change-Id: I26a13117a8c2e032a9cc70ca0f040122cbf79886
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Leander Beernaert 2019-11-11 11:39:02 +01:00
parent 36fcfd962d
commit 15b78b3b54
17 changed files with 18 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/manual/cocoa/menurama/menurama.pro
View File

@ -4,9 +4,7 @@
# #
#------------------------------------------------- #-------------------------------------------------
QT += core gui QT += core gui widgets
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = Menurama TARGET = Menurama
TEMPLATE = app TEMPLATE = app

12
tests/manual/diaglib/diaglib.pri
View File

@ -17,7 +17,6 @@ win32:!winrt: {
SOURCES += $$PWD/nativewindowdump.cpp SOURCES += $$PWD/nativewindowdump.cpp
} }
greaterThan(QT_MAJOR_VERSION, 4) {
QT += gui-private core-private QT += gui-private core-private
contains(QT, widgets) { contains(QT, widgets) {
HEADERS += \ HEADERS += \
@ -30,17 +29,6 @@ greaterThan(QT_MAJOR_VERSION, 4) {
$$PWD/debugproxystyle.cpp \ $$PWD/debugproxystyle.cpp \
$$PWD/logwidget.cpp $$PWD/logwidget.cpp
} }
} else {
HEADERS += \
$$PWD/qwidgetdump.h \
$$PWD/debugproxystyle.h \
$$PWD/logwidget.h
SOURCES += \
$$PWD/qwidgetdump.cpp \
$$PWD/debugproxystyle.cpp \
$$PWD/logwidget.cpp
}
contains(QT, opengl) { contains(QT, opengl) {
HEADERS += \ HEADERS += \

6
tests/manual/dialogs/dialogs.pro
View File

@ -1,9 +1,5 @@
QT += core gui QT += core gui widgets
greaterThan(QT_MAJOR_VERSION, 4) {
QT += widgets
qtHaveModule(printsupport): QT += printsupport qtHaveModule(printsupport): QT += printsupport
}
TARGET = dialogs TARGET = dialogs
TEMPLATE = app TEMPLATE = app

4
tests/manual/manual.pro
View File

@ -67,8 +67,4 @@ qtConfig(opengl) {
win32: SUBDIRS -= network_remote_stresstest network_stresstest win32: SUBDIRS -= network_remote_stresstest network_stresstest
lessThan(QT_MAJOR_VERSION, 5): SUBDIRS -= bearerex lance qnetworkaccessmanager/qget qmimedatabase qnetworkreply \
qpainfo qscreen socketengine xembed-raster xembed-widgets windowtransparency \
embeddedintoforeignwindow foreignwindows
qtConfig(vulkan): SUBDIRS += qvulkaninstance qtConfig(vulkan): SUBDIRS += qvulkaninstance

3
tests/manual/qcursor/qcursorhighdpi/qcursorhighdpi.pro
View File

@ -1,6 +1,5 @@
TEMPLATE = app TEMPLATE = app
QT = core gui QT = core gui gui-private core-private widgets
greaterThan(QT_MAJOR_VERSION, 4): QT += gui-private core-private widgets
CONFIG -= app_bundle CONFIG -= app_bundle
SOURCES += main.cpp SOURCES += main.cpp
win32: LIBS += -lUser32 win32: LIBS += -lUser32

2
tests/manual/qtexteditlist/qtexteditlist.pro
View File

@ -1,6 +1,6 @@
#This project can be used to verify QTBUG-5111 case. #This project can be used to verify QTBUG-5111 case.
QT += core gui QT += core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets QT += widgets
TARGET = qtexteditlist TARGET = qtexteditlist
TEMPLATE = app TEMPLATE = app
SOURCES += main.cpp widget.cpp SOURCES += main.cpp widget.cpp

3
tests/manual/qtexttableborders/qtexttableborders.pro
View File

@ -1,7 +1,6 @@
#This project can be used to verify QTBUG-36152 case. #This project can be used to verify QTBUG-36152 case.
QT += core gui printsupport QT += core gui printsupport widgets
CONFIG += c++11 CONFIG += c++11
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = qtexttableborders TARGET = qtexttableborders
TEMPLATE = app TEMPLATE = app
SOURCES += main.cpp widget.cpp SOURCES += main.cpp widget.cpp

3
tests/manual/qtouchevent/qtouchevent.pro
View File

@ -1,5 +1,4 @@
QT += testlib QT += testlib widgets
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
SOURCES = main.cpp \ SOURCES = main.cpp \
touchwidget.cpp touchwidget.cpp
FORMS += form.ui FORMS += form.ui

3
tests/manual/touch/touch.pro
View File

@ -1,5 +1,4 @@
TEMPLATE = app TEMPLATE = app
QT = core gui QT = core gui widgets
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
CONFIG -= app_bundle CONFIG -= app_bundle
SOURCES += main.cpp SOURCES += main.cpp

3
tests/manual/unc/unc.pro
View File

@ -1,5 +1,4 @@
QT += core gui QT += core gui widgets
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TEMPLATE = app TEMPLATE = app

6
tests/manual/widgetgrab/widgetgrab.pro
View File

@ -1,9 +1,5 @@
QT += core gui QT += core gui widgets
TARGET = widgetgrab TARGET = widgetgrab
TEMPLATE = app TEMPLATE = app
SOURCES += main.cpp SOURCES += main.cpp
greaterThan(QT_MAJOR_VERSION, 4) {
QT += widgets
}

3
tests/manual/widgets/widgets.pro
View File

@ -1,3 +1,2 @@
TEMPLATE = subdirs TEMPLATE = subdirs
SUBDIRS = itemviews qgraphicsview kernel widgets SUBDIRS = itemviews qgraphicsview kernel widgets styles
greaterThan(QT_MAJOR_VERSION, 4): SUBDIRS += styles

4
tests/manual/widgets/widgets/bigmenucreator/bigmenucreator.pro
View File

@ -4,9 +4,7 @@
# #
#------------------------------------------------- #-------------------------------------------------
QT += core gui QT += core gui widgets
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = BigMenuCreator TARGET = BigMenuCreator
TEMPLATE = app TEMPLATE = app

3
tests/manual/windowchildgeometry/windowchildgeometry.pro
View File

@ -1,5 +1,4 @@
QT += core gui QT += core gui widgets
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = windowchildgeometry TARGET = windowchildgeometry
TEMPLATE = app TEMPLATE = app

2
tests/manual/windowflags/windowflags.pro
View File

@ -9,4 +9,4 @@ SOURCES = controllerwindow.cpp \
main.cpp \ main.cpp \
controls.cpp controls.cpp
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets QT += widgets

3
tests/manual/windowgeometry/windowgeometry.pro
View File

@ -1,5 +1,4 @@
QT += core gui QT += core gui widgets
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = windowgeometry TARGET = windowgeometry
TEMPLATE = app TEMPLATE = app

2
tests/manual/windowmodality/windowmodality.pro
View File

@ -1,3 +1,3 @@
SOURCES = main.cpp SOURCES = main.cpp
FORMS = widget.ui dialog.ui FORMS = widget.ui dialog.ui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport QT += widgets printsupport