diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-08-01 13:19:40 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-01 15:37:46 +0200 |
| commit | 672b5b7ab668c67477d36edfcda98caafd35edc0 (patch) | |
| tree | f2821cc3b7bb5ec80e68d66b45182433edf58c5e /tests/manual | |
| parent | 262f53210fdeed1ceeda96156dce18e589259f41 (diff) | |
Set the Qt API level to compatibility mode in all tests.
Qt 5.0 beta requires changing the default to the 5.0 API, disabling
the deprecated code. However, tests should test (and often do) the
compatibility API too, so turn it back on.
Task-number: QTBUG-25053
Change-Id: I8129c3ef3cb58541c95a32d083850d9e7f768927
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'tests/manual')
44 files changed, 44 insertions, 0 deletions
diff --git a/tests/manual/bearerex/bearerex.pro b/tests/manual/bearerex/bearerex.pro index a49c644e2e..57b82a0b51 100644 --- a/tests/manual/bearerex/bearerex.pro +++ b/tests/manual/bearerex/bearerex.pro @@ -25,3 +25,4 @@ SOURCES += bearerex.cpp \ main.cpp \ xqlistwidget.cpp \ datatransferer.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/cocoa/menus/menus.pro b/tests/manual/cocoa/menus/menus.pro index 0ccb25feb9..855a77455f 100644 --- a/tests/manual/cocoa/menus/menus.pro +++ b/tests/manual/cocoa/menus/menus.pro @@ -3,3 +3,4 @@ TEMPLATE = app SOURCES += main.cpp QT += gui widgets CONFIG -=app_bundle +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/cocoa/qt_on_cocoa/qt_on_cocoa.pro b/tests/manual/cocoa/qt_on_cocoa/qt_on_cocoa.pro index d5399b543a..3d526909a5 100644 --- a/tests/manual/cocoa/qt_on_cocoa/qt_on_cocoa.pro +++ b/tests/manual/cocoa/qt_on_cocoa/qt_on_cocoa.pro @@ -10,3 +10,4 @@ OTHER_FILES = Info_mac.plist QT += gui widgets widgets-private gui-private core-private QT += declarative +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/cocoa/wheelevent/wheelevent.pro b/tests/manual/cocoa/wheelevent/wheelevent.pro index 6eca6d48cf..cf32954750 100644 --- a/tests/manual/cocoa/wheelevent/wheelevent.pro +++ b/tests/manual/cocoa/wheelevent/wheelevent.pro @@ -4,3 +4,4 @@ HEADERS += window.h SOURCES += window.cpp main.cpp QT += core gui gui-private core-private +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/gestures/graphicsview/graphicsview.pro b/tests/manual/gestures/graphicsview/graphicsview.pro index 9ecd0b372f..4cc989efd2 100644 --- a/tests/manual/gestures/graphicsview/graphicsview.pro +++ b/tests/manual/gestures/graphicsview/graphicsview.pro @@ -8,3 +8,4 @@ SOURCES += main.cpp \ HEADERS += imageitem.h \ gestures.h \ mousepangesturerecognizer.h +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/gestures/scrollarea/scrollarea.pro b/tests/manual/gestures/scrollarea/scrollarea.pro index 84e2af3f49..a4854e2599 100644 --- a/tests/manual/gestures/scrollarea/scrollarea.pro +++ b/tests/manual/gestures/scrollarea/scrollarea.pro @@ -3,3 +3,4 @@ QT += widgets SOURCES = main.cpp \ mousepangesturerecognizer.cpp HEADERS += mousepangesturerecognizer.h +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/inputmethodhints/inputmethodhints.pro b/tests/manual/inputmethodhints/inputmethodhints.pro index f253f72332..2f6608b602 100644 --- a/tests/manual/inputmethodhints/inputmethodhints.pro +++ b/tests/manual/inputmethodhints/inputmethodhints.pro @@ -8,3 +8,4 @@ SOURCES += main.cpp \ inputmethodhints.cpp FORMS += inputmethodhints.ui RESOURCES += +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/keypadnavigation/keypadnavigation.pro b/tests/manual/keypadnavigation/keypadnavigation.pro index a45d38af21..3ec3241998 100644 --- a/tests/manual/keypadnavigation/keypadnavigation.pro +++ b/tests/manual/keypadnavigation/keypadnavigation.pro @@ -1,3 +1,4 @@ QT += widgets SOURCES += main.cpp FORMS += keypadnavigation.ui +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/lance/lance.pro b/tests/manual/lance/lance.pro index 4b319369e6..6d1d7fa392 100644 --- a/tests/manual/lance/lance.pro +++ b/tests/manual/lance/lance.pro @@ -15,3 +15,4 @@ RESOURCES += icons.qrc \ contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/network_remote_stresstest/network_remote_stresstest.pro b/tests/manual/network_remote_stresstest/network_remote_stresstest.pro index 8b52240509..02836f0a5d 100644 --- a/tests/manual/network_remote_stresstest/network_remote_stresstest.pro +++ b/tests/manual/network_remote_stresstest/network_remote_stresstest.pro @@ -8,3 +8,4 @@ SOURCES += tst_network_remote_stresstest.cpp RESOURCES += url-list.qrc LIBS += $$QMAKE_LIBS_NETWORK +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/network_stresstest/network_stresstest.pro b/tests/manual/network_stresstest/network_stresstest.pro index ebddf12961..15a9156597 100644 --- a/tests/manual/network_stresstest/network_stresstest.pro +++ b/tests/manual/network_stresstest/network_stresstest.pro @@ -12,3 +12,4 @@ HEADERS += \ RESOURCES += wwwfiles.qrc QMAKE_RESOURCE_FLAGS += -no-compress LIBS += $$QMAKE_LIBS_NETWORK +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/qcursor/allcursors/allcursors.pro b/tests/manual/qcursor/allcursors/allcursors.pro index b9f6a0c98d..c85ef861c2 100644 --- a/tests/manual/qcursor/allcursors/allcursors.pro +++ b/tests/manual/qcursor/allcursors/allcursors.pro @@ -14,3 +14,4 @@ SOURCES += main.cpp\ HEADERS += mainwindow.h FORMS += mainwindow.ui +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/qcursor/grab_override/grab_override.pro b/tests/manual/qcursor/grab_override/grab_override.pro index d84e2ee2b8..d163a726c3 100644 --- a/tests/manual/qcursor/grab_override/grab_override.pro +++ b/tests/manual/qcursor/grab_override/grab_override.pro @@ -16,3 +16,4 @@ HEADERS += mainwindow.h FORMS += mainwindow.ui RESOURCES += images.qrc +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/qdesktopwidget/qdesktopwidget.pro b/tests/manual/qdesktopwidget/qdesktopwidget.pro index 8979e7ef35..8d10589476 100644 --- a/tests/manual/qdesktopwidget/qdesktopwidget.pro +++ b/tests/manual/qdesktopwidget/qdesktopwidget.pro @@ -1,3 +1,4 @@ TEMPLATE = app QT += widgets SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/qgraphicsitemgroup/qgraphicsitemgroup.pro b/tests/manual/qgraphicsitemgroup/qgraphicsitemgroup.pro index 6135f74b8b..a45ad29a5b 100644 --- a/tests/manual/qgraphicsitemgroup/qgraphicsitemgroup.pro +++ b/tests/manual/qgraphicsitemgroup/qgraphicsitemgroup.pro @@ -7,3 +7,4 @@ SOURCES += main.cpp \ HEADERS += widget.h \ customitem.h FORMS += widget.ui +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/qgraphicslayout/flicker/flicker.pro b/tests/manual/qgraphicslayout/flicker/flicker.pro index d800418f85..12506c5571 100644 --- a/tests/manual/qgraphicslayout/flicker/flicker.pro +++ b/tests/manual/qgraphicslayout/flicker/flicker.pro @@ -1,3 +1,4 @@ QT += widgets HEADERS += window.h SOURCES += main.cpp window.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro b/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro index 8e73add252..c33c87cd04 100644 --- a/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro +++ b/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro @@ -6,3 +6,4 @@ QT -= gui QT += network testlib SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/qimagereader/qimagereader.pro b/tests/manual/qimagereader/qimagereader.pro index 3523257f3e..99e96537dc 100644 --- a/tests/manual/qimagereader/qimagereader.pro +++ b/tests/manual/qimagereader/qimagereader.pro @@ -1,2 +1,3 @@ QT += widgets SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/qlocale/qlocale.pro b/tests/manual/qlocale/qlocale.pro index a5a2766e65..98079c7690 100644 --- a/tests/manual/qlocale/qlocale.pro +++ b/tests/manual/qlocale/qlocale.pro @@ -1,3 +1,4 @@ QT += widgets HEADERS += currency.h calendar.h dateformats.h numberformats.h languages.h window.h miscellaneous.h info.h SOURCES += currency.cpp main.cpp calendar.cpp dateformats.cpp numberformats.cpp languages.cpp window.cpp miscellaneous.cpp info.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/qnetworkaccessmanager/qget/qget.pro b/tests/manual/qnetworkaccessmanager/qget/qget.pro index 8a632f8d4e..082ffa7ac8 100644 --- a/tests/manual/qnetworkaccessmanager/qget/qget.pro +++ b/tests/manual/qnetworkaccessmanager/qget/qget.pro @@ -6,3 +6,4 @@ SOURCES += qget.cpp SOURCES += transferitem.cpp SOURCES += downloadmanager.cpp HEADERS += qget.h +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro b/tests/manual/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro index 9e78f91621..09cf2255f2 100644 --- a/tests/manual/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro +++ b/tests/manual/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro @@ -6,3 +6,4 @@ QT -= gui QT += network testlib SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/qnetworkreply/qnetworkreply.pro b/tests/manual/qnetworkreply/qnetworkreply.pro index e29ea7856c..2897e55857 100644 --- a/tests/manual/qnetworkreply/qnetworkreply.pro +++ b/tests/manual/qnetworkreply/qnetworkreply.pro @@ -6,3 +6,4 @@ QT -= gui QT += network testlib SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/qssloptions/qssloptions.pro b/tests/manual/qssloptions/qssloptions.pro index 55d6dd049b..c3487aa844 100644 --- a/tests/manual/qssloptions/qssloptions.pro +++ b/tests/manual/qssloptions/qssloptions.pro @@ -7,3 +7,4 @@ QT += network testlib #CONFIG += release SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/qtabletevent/device_information/device_information.pro b/tests/manual/qtabletevent/device_information/device_information.pro index 727ad34bc1..59669843ba 100644 --- a/tests/manual/qtabletevent/device_information/device_information.pro +++ b/tests/manual/qtabletevent/device_information/device_information.pro @@ -4,3 +4,4 @@ SOURCES += \ tabletwidget.cpp HEADERS += \ tabletwidget.h +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/qtabletevent/event_compression/event_compression.pro b/tests/manual/qtabletevent/event_compression/event_compression.pro index 15650d6190..8300c33c87 100644 --- a/tests/manual/qtabletevent/event_compression/event_compression.pro +++ b/tests/manual/qtabletevent/event_compression/event_compression.pro @@ -3,3 +3,4 @@ QT += widgets testlib SOURCES += main.cpp \ mousestatwidget.cpp HEADERS += mousestatwidget.h +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/qtabletevent/regular_widgets/regular_widgets.pro b/tests/manual/qtabletevent/regular_widgets/regular_widgets.pro index 8f1f4342ee..fa41d09d1b 100644 --- a/tests/manual/qtabletevent/regular_widgets/regular_widgets.pro +++ b/tests/manual/qtabletevent/regular_widgets/regular_widgets.pro @@ -2,3 +2,4 @@ TEMPLATE = app QT += widgets SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/qtbug-8933/qtbug-8933.pro b/tests/manual/qtbug-8933/qtbug-8933.pro index 4600d47cac..0d8bfcc797 100644 --- a/tests/manual/qtbug-8933/qtbug-8933.pro +++ b/tests/manual/qtbug-8933/qtbug-8933.pro @@ -14,3 +14,4 @@ SOURCES += main.cpp\ HEADERS += widget.h FORMS += widget.ui +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/qtouchevent/qtouchevent.pro b/tests/manual/qtouchevent/qtouchevent.pro index 6339bceb42..aa4339f693 100644 --- a/tests/manual/qtouchevent/qtouchevent.pro +++ b/tests/manual/qtouchevent/qtouchevent.pro @@ -3,3 +3,4 @@ SOURCES = main.cpp \ touchwidget.cpp FORMS += form.ui HEADERS += touchwidget.h +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/qwidget_zorder/qwidget_zorder.pro b/tests/manual/qwidget_zorder/qwidget_zorder.pro index 3523257f3e..99e96537dc 100644 --- a/tests/manual/qwidget_zorder/qwidget_zorder.pro +++ b/tests/manual/qwidget_zorder/qwidget_zorder.pro @@ -1,2 +1,3 @@ QT += widgets SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/repaint/mainwindow/mainwindow.pro b/tests/manual/repaint/mainwindow/mainwindow.pro index f20e5fe402..1fc3773864 100644 --- a/tests/manual/repaint/mainwindow/mainwindow.pro +++ b/tests/manual/repaint/mainwindow/mainwindow.pro @@ -1,3 +1,4 @@ QT += widgets HEADERS += ../shared/shared.h SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/repaint/scrollarea/scrollarea.pro b/tests/manual/repaint/scrollarea/scrollarea.pro index f20e5fe402..1fc3773864 100644 --- a/tests/manual/repaint/scrollarea/scrollarea.pro +++ b/tests/manual/repaint/scrollarea/scrollarea.pro @@ -1,3 +1,4 @@ QT += widgets HEADERS += ../shared/shared.h SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/repaint/splitter/splitter.pro b/tests/manual/repaint/splitter/splitter.pro index f20e5fe402..1fc3773864 100644 --- a/tests/manual/repaint/splitter/splitter.pro +++ b/tests/manual/repaint/splitter/splitter.pro @@ -1,3 +1,4 @@ QT += widgets HEADERS += ../shared/shared.h SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/repaint/tableview/tableview.pro b/tests/manual/repaint/tableview/tableview.pro index 6a5aaad251..ae27c84109 100644 --- a/tests/manual/repaint/tableview/tableview.pro +++ b/tests/manual/repaint/tableview/tableview.pro @@ -1,3 +1,4 @@ QT += widgets HEADERS +=../shared/shared.h SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/repaint/task141091/task141091.pro b/tests/manual/repaint/task141091/task141091.pro index b54299e540..a7db71ba3e 100644 --- a/tests/manual/repaint/task141091/task141091.pro +++ b/tests/manual/repaint/task141091/task141091.pro @@ -1,3 +1,4 @@ CONFIG += console QT += widgets SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/repaint/toplevel/toplevel.pro b/tests/manual/repaint/toplevel/toplevel.pro index a881c24f56..827a7e2dac 100644 --- a/tests/manual/repaint/toplevel/toplevel.pro +++ b/tests/manual/repaint/toplevel/toplevel.pro @@ -3,3 +3,4 @@ QT += widgets HEADERS += ../shared/shared.h SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/repaint/widget/widget.pro b/tests/manual/repaint/widget/widget.pro index f20e5fe402..1fc3773864 100644 --- a/tests/manual/repaint/widget/widget.pro +++ b/tests/manual/repaint/widget/widget.pro @@ -1,3 +1,4 @@ QT += widgets HEADERS += ../shared/shared.h SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/socketengine/socketengine.pro b/tests/manual/socketengine/socketengine.pro index 96831383ec..d9ac4cd2ca 100644 --- a/tests/manual/socketengine/socketengine.pro +++ b/tests/manual/socketengine/socketengine.pro @@ -6,3 +6,4 @@ QT -= gui QT += network-private core-private testlib SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/textrendering/glyphshaping/glyphshaping.pro b/tests/manual/textrendering/glyphshaping/glyphshaping.pro index 6500814423..5dc8542e86 100644 --- a/tests/manual/textrendering/glyphshaping/glyphshaping.pro +++ b/tests/manual/textrendering/glyphshaping/glyphshaping.pro @@ -4,3 +4,4 @@ OTHER_FILES = glyphshaping_data.xml glyphshaping_data.path = . glyphshaping_data.files = $$PWD/glyphshaping_data.xml DEPLOYMENT += glyphshaping_data +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/textrendering/textperformance/textperformance.pro b/tests/manual/textrendering/textperformance/textperformance.pro index f07a4f0294..acfd7b1906 100644 --- a/tests/manual/textrendering/textperformance/textperformance.pro +++ b/tests/manual/textrendering/textperformance/textperformance.pro @@ -1,2 +1,3 @@ QT += widgets SOURCES = main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/widgets/itemviews/delegate/delegate.pro b/tests/manual/widgets/itemviews/delegate/delegate.pro index e5c90f18ec..1ce6d141ab 100644 --- a/tests/manual/widgets/itemviews/delegate/delegate.pro +++ b/tests/manual/widgets/itemviews/delegate/delegate.pro @@ -1,3 +1,4 @@ TEMPLATE = app QT += widgets SOURCES=example.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/widgets/itemviews/qheaderview/qheaderviewtest.pro b/tests/manual/widgets/itemviews/qheaderview/qheaderviewtest.pro index ac40c6e9e1..f83136266d 100644 --- a/tests/manual/widgets/itemviews/qheaderview/qheaderviewtest.pro +++ b/tests/manual/widgets/itemviews/qheaderview/qheaderviewtest.pro @@ -1,3 +1,4 @@ TEMPLATE = app SOURCES = qheaderviewtest1.cpp QT += widgets +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/windowflags/windowflags.pro b/tests/manual/windowflags/windowflags.pro index ba0f75b65c..546264cafc 100644 --- a/tests/manual/windowflags/windowflags.pro +++ b/tests/manual/windowflags/windowflags.pro @@ -8,3 +8,4 @@ SOURCES = controllerwindow.cpp \ controls.cpp greaterThan(QT_MAJOR_VERSION, 4): QT += widgets +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/windowgeometry/windowgeometry.pro b/tests/manual/windowgeometry/windowgeometry.pro index 44ea97ba62..f339dc4d09 100644 --- a/tests/manual/windowgeometry/windowgeometry.pro +++ b/tests/manual/windowgeometry/windowgeometry.pro @@ -7,3 +7,4 @@ SOURCES += $$PWD/main.cpp controllerwidget.cpp ../windowflags/controls.cpp HEADERS += controllerwidget.h ../windowflags/controls.h greaterThan(QT_MAJOR_VERSION, 4): QT += widgets +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/windowmodality/windowmodality.pro b/tests/manual/windowmodality/windowmodality.pro index b29e939d27..12071fa7ee 100644 --- a/tests/manual/windowmodality/windowmodality.pro +++ b/tests/manual/windowmodality/windowmodality.pro @@ -1,3 +1,4 @@ SOURCES = main.cpp FORMS = widget.ui dialog.ui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |