diff options
Diffstat (limited to 'tests/manual')
53 files changed, 16 insertions, 60 deletions
diff --git a/tests/manual/bearerex/bearerex.pro b/tests/manual/bearerex/bearerex.pro index 8f0af52b40..e643657660 100644 --- a/tests/manual/bearerex/bearerex.pro +++ b/tests/manual/bearerex/bearerex.pro @@ -19,4 +19,3 @@ 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 855a77455f..0ccb25feb9 100644 --- a/tests/manual/cocoa/menus/menus.pro +++ b/tests/manual/cocoa/menus/menus.pro @@ -3,4 +3,3 @@ TEMPLATE = app SOURCES += main.cpp QT += gui widgets CONFIG -=app_bundle -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/cocoa/nativewidgets/nativewigets.pro b/tests/manual/cocoa/nativewidgets/nativewigets.pro index f1b1260688..d81b567276 100644 --- a/tests/manual/cocoa/nativewidgets/nativewigets.pro +++ b/tests/manual/cocoa/nativewidgets/nativewigets.pro @@ -4,4 +4,3 @@ HEADERS += SOURCES += main.cpp QT += core widgets -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/cocoa/qmaccocoaviewcontainer/TestMouseMovedNSView.h b/tests/manual/cocoa/qmaccocoaviewcontainer/TestMouseMovedNSView.h index 95601906e7..5aaffc7048 100644 --- a/tests/manual/cocoa/qmaccocoaviewcontainer/TestMouseMovedNSView.h +++ b/tests/manual/cocoa/qmaccocoaviewcontainer/TestMouseMovedNSView.h @@ -31,7 +31,7 @@ ** ****************************************************************************/ -#import <Cocoa/Cocoa.h> +#import <AppKit/AppKit.h> @interface TestMouseMovedNSView : NSView { NSPoint mouseMovedPoint_; diff --git a/tests/manual/cocoa/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro b/tests/manual/cocoa/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro index 9546adea1c..1d1eb08253 100644 --- a/tests/manual/cocoa/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro +++ b/tests/manual/cocoa/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = qmaccocoaviewcontainer INCLUDEPATH += . QT += widgets -LIBS += -framework Cocoa +LIBS += -framework AppKit # Input OBJECTIVE_SOURCES += main.mm TestMouseMovedNSView.m HEADERS += TestMouseMovedNSView.h diff --git a/tests/manual/cocoa/qt_on_cocoa/main.mm b/tests/manual/cocoa/qt_on_cocoa/main.mm index 23370b0305..219bb56416 100644 --- a/tests/manual/cocoa/qt_on_cocoa/main.mm +++ b/tests/manual/cocoa/qt_on_cocoa/main.mm @@ -36,7 +36,7 @@ #include <QtGui> #include <QtWidgets/QtWidgets> -#include <Cocoa/Cocoa.h> +#include <AppKit/AppKit.h> @interface AppDelegate : NSObject <NSApplicationDelegate> { QGuiApplication *m_app; 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 97e4473e15..91c4d2c875 100644 --- a/tests/manual/cocoa/qt_on_cocoa/qt_on_cocoa.pro +++ b/tests/manual/cocoa/qt_on_cocoa/qt_on_cocoa.pro @@ -3,7 +3,7 @@ TEMPLATE = app OBJECTIVE_SOURCES += main.mm HEADERS += rasterwindow.h SOURCES += rasterwindow.cpp -LIBS += -framework Cocoa +LIBS += -framework AppKit QT += gui widgets quick diff --git a/tests/manual/cocoa/wheelevent/wheelevent.pro b/tests/manual/cocoa/wheelevent/wheelevent.pro index f90302da95..3a30aef3fb 100644 --- a/tests/manual/cocoa/wheelevent/wheelevent.pro +++ b/tests/manual/cocoa/wheelevent/wheelevent.pro @@ -4,4 +4,3 @@ HEADERS += window.h SOURCES += window.cpp main.cpp QT += core core-private gui gui-private widgets -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/gestures/graphicsview/graphicsview.pro b/tests/manual/gestures/graphicsview/graphicsview.pro index 4cc989efd2..9ecd0b372f 100644 --- a/tests/manual/gestures/graphicsview/graphicsview.pro +++ b/tests/manual/gestures/graphicsview/graphicsview.pro @@ -8,4 +8,3 @@ 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 a4854e2599..84e2af3f49 100644 --- a/tests/manual/gestures/scrollarea/scrollarea.pro +++ b/tests/manual/gestures/scrollarea/scrollarea.pro @@ -3,4 +3,3 @@ 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 2f6608b602..f253f72332 100644 --- a/tests/manual/inputmethodhints/inputmethodhints.pro +++ b/tests/manual/inputmethodhints/inputmethodhints.pro @@ -8,4 +8,3 @@ 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 3ec3241998..a45d38af21 100644 --- a/tests/manual/keypadnavigation/keypadnavigation.pro +++ b/tests/manual/keypadnavigation/keypadnavigation.pro @@ -1,4 +1,3 @@ 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 430c9196e6..312106c2f0 100644 --- a/tests/manual/lance/lance.pro +++ b/tests/manual/lance/lance.pro @@ -16,4 +16,3 @@ RESOURCES += icons.qrc \ qtHaveModule(opengl): 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 736747e486..754776f7e9 100644 --- a/tests/manual/network_remote_stresstest/network_remote_stresstest.pro +++ b/tests/manual/network_remote_stresstest/network_remote_stresstest.pro @@ -7,4 +7,3 @@ 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_remote_stresstest/tst_network_remote_stresstest.cpp b/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp index 486c5179b7..df61325439 100644 --- a/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp +++ b/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp @@ -246,30 +246,31 @@ void tst_NetworkRemoteStressTest::blockingSequentialRemoteHosts() socket = QSharedPointer<QTcpSocket>(new QTcpSocket); socket->connectToHost(url.host(), url.port(isHttps ? 443 : 80)); - QVERIFY2(socket->waitForConnected(10000), "Timeout connecting to " + url.encodedHost()); + const QByteArray encodedHost = url.host(QUrl::FullyEncoded).toLatin1(); + QVERIFY2(socket->waitForConnected(10000), "Timeout connecting to " + encodedHost); #ifndef QT_NO_SSL if (isHttps) { static_cast<QSslSocket *>(socket.data())->setProtocol(QSsl::TlsV1_0); static_cast<QSslSocket *>(socket.data())->startClientEncryption(); static_cast<QSslSocket *>(socket.data())->ignoreSslErrors(); - QVERIFY2(static_cast<QSslSocket *>(socket.data())->waitForEncrypted(10000), "Timeout starting TLS with " + url.encodedHost()); + QVERIFY2(static_cast<QSslSocket *>(socket.data())->waitForEncrypted(10000), "Timeout starting TLS with " + encodedHost); } #endif // QT_NO_SSL socket->write("GET " + url.toEncoded(QUrl::RemoveScheme | QUrl::RemoveAuthority | QUrl::RemoveFragment) + " HTTP/1.0\r\n" "Connection: close\r\n" "User-Agent: tst_QTcpSocket_stresstest/1.0\r\n" - "Host: " + url.encodedHost() + "\r\n" + "Host: " + encodedHost + "\r\n" "\r\n"); while (socket->bytesToWrite()) - QVERIFY2(socket->waitForBytesWritten(10000), "Timeout writing to " + url.encodedHost()); + QVERIFY2(socket->waitForBytesWritten(10000), "Timeout writing to " + encodedHost); while (socket->state() == QAbstractSocket::ConnectedState && !timeout.hasExpired(10000)) { socket->waitForReadyRead(10000); byteCounter += socket->readAll().size(); // discard } - QVERIFY2(!timeout.hasExpired(10000), "Timeout reading from " + url.encodedHost()); + QVERIFY2(!timeout.hasExpired(10000), "Timeout reading from " + encodedHost); totalBytes += byteCounter; if (intermediateDebug) { @@ -318,16 +319,17 @@ void tst_NetworkRemoteStressTest::sequentialRemoteHosts() socket->connectToHost(url.host(), url.port(80)); } + const QByteArray encodedHost = url.host(QUrl::FullyEncoded).toLatin1(); socket->write("GET " + url.toEncoded(QUrl::RemoveScheme | QUrl::RemoveAuthority | QUrl::RemoveFragment) + " HTTP/1.0\r\n" "Connection: close\r\n" "User-Agent: tst_QTcpSocket_stresstest/1.0\r\n" - "Host: " + url.encodedHost() + "\r\n" + "Host: " + encodedHost + "\r\n" "\r\n"); connect(socket.data(), SIGNAL(readyRead()), SLOT(slotReadAll())); QTestEventLoop::instance().connect(socket.data(), SIGNAL(disconnected()), SLOT(exitLoop())); QTestEventLoop::instance().enterLoop(30); - QVERIFY2(!QTestEventLoop::instance().timeout(), "Timeout with " + url.encodedHost() + "; " + QVERIFY2(!QTestEventLoop::instance().timeout(), "Timeout with " + encodedHost + "; " + QByteArray::number(socket->bytesToWrite()) + " bytes to write"); totalBytes += byteCounter; @@ -397,10 +399,11 @@ void tst_NetworkRemoteStressTest::parallelRemoteHosts() socket->connectToHost(url.host(), url.port(isHttps ? 443 : 80)); } + const QByteArray encodedHost = url.host(QUrl::FullyEncoded).toLatin1(); socket->write("GET " + url.toEncoded(QUrl::RemoveScheme | QUrl::RemoveAuthority | QUrl::RemoveFragment) + " HTTP/1.0\r\n" "Connection: close\r\n" "User-Agent: tst_QTcpSocket_stresstest/1.0\r\n" - "Host: " + url.encodedHost() + "\r\n" + "Host: " + encodedHost + "\r\n" "\r\n"); connect(socket, SIGNAL(readyRead()), SLOT(slotReadAll())); QTestEventLoop::instance().connect(socket, SIGNAL(disconnected()), SLOT(exitLoop())); diff --git a/tests/manual/qcursor/allcursors/allcursors.pro b/tests/manual/qcursor/allcursors/allcursors.pro index c85ef861c2..b9f6a0c98d 100644 --- a/tests/manual/qcursor/allcursors/allcursors.pro +++ b/tests/manual/qcursor/allcursors/allcursors.pro @@ -14,4 +14,3 @@ 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 d163a726c3..d84e2ee2b8 100644 --- a/tests/manual/qcursor/grab_override/grab_override.pro +++ b/tests/manual/qcursor/grab_override/grab_override.pro @@ -16,4 +16,3 @@ 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 8d10589476..8979e7ef35 100644 --- a/tests/manual/qdesktopwidget/qdesktopwidget.pro +++ b/tests/manual/qdesktopwidget/qdesktopwidget.pro @@ -1,4 +1,3 @@ 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 a45ad29a5b..6135f74b8b 100644 --- a/tests/manual/qgraphicsitemgroup/qgraphicsitemgroup.pro +++ b/tests/manual/qgraphicsitemgroup/qgraphicsitemgroup.pro @@ -7,4 +7,3 @@ 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 12506c5571..d800418f85 100644 --- a/tests/manual/qgraphicslayout/flicker/flicker.pro +++ b/tests/manual/qgraphicslayout/flicker/flicker.pro @@ -1,4 +1,3 @@ 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 8440453cb7..62838785d6 100644 --- a/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro +++ b/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro @@ -5,4 +5,3 @@ 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 99e96537dc..3523257f3e 100644 --- a/tests/manual/qimagereader/qimagereader.pro +++ b/tests/manual/qimagereader/qimagereader.pro @@ -1,3 +1,2 @@ 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 98079c7690..a5a2766e65 100644 --- a/tests/manual/qlocale/qlocale.pro +++ b/tests/manual/qlocale/qlocale.pro @@ -1,4 +1,3 @@ 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 082ffa7ac8..8a632f8d4e 100644 --- a/tests/manual/qnetworkaccessmanager/qget/qget.pro +++ b/tests/manual/qnetworkaccessmanager/qget/qget.pro @@ -6,4 +6,3 @@ 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 79de15933e..8f9314cc96 100644 --- a/tests/manual/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro +++ b/tests/manual/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro @@ -5,4 +5,3 @@ 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 64666103a0..eddcbdff1d 100644 --- a/tests/manual/qnetworkreply/qnetworkreply.pro +++ b/tests/manual/qnetworkreply/qnetworkreply.pro @@ -5,4 +5,3 @@ QT -= gui QT += core-private network network-private 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 d4325b0fd1..a98fd61f51 100644 --- a/tests/manual/qssloptions/qssloptions.pro +++ b/tests/manual/qssloptions/qssloptions.pro @@ -6,4 +6,3 @@ 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 59669843ba..727ad34bc1 100644 --- a/tests/manual/qtabletevent/device_information/device_information.pro +++ b/tests/manual/qtabletevent/device_information/device_information.pro @@ -4,4 +4,3 @@ SOURCES += \ tabletwidget.cpp HEADERS += \ tabletwidget.h -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/qtabletevent/device_information/tabletwidget.cpp b/tests/manual/qtabletevent/device_information/tabletwidget.cpp index f1d838f01d..2462bb3701 100644 --- a/tests/manual/qtabletevent/device_information/tabletwidget.cpp +++ b/tests/manual/qtabletevent/device_information/tabletwidget.cpp @@ -61,7 +61,7 @@ bool TabletWidget::eventFilter(QObject *, QEvent *ev) mType = event->type(); mPos = event->pos(); mGPos = event->globalPos(); - mHiResGlobalPos = event->hiResGlobalPos(); + mHiResGlobalPos = event->posF(); mDev = event->device(); mPointerType = event->pointerType(); mUnique = event->uniqueId(); diff --git a/tests/manual/qtabletevent/event_compression/event_compression.pro b/tests/manual/qtabletevent/event_compression/event_compression.pro index 8300c33c87..15650d6190 100644 --- a/tests/manual/qtabletevent/event_compression/event_compression.pro +++ b/tests/manual/qtabletevent/event_compression/event_compression.pro @@ -3,4 +3,3 @@ 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 fa41d09d1b..8f1f4342ee 100644 --- a/tests/manual/qtabletevent/regular_widgets/regular_widgets.pro +++ b/tests/manual/qtabletevent/regular_widgets/regular_widgets.pro @@ -2,4 +2,3 @@ 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 0d8bfcc797..4600d47cac 100644 --- a/tests/manual/qtbug-8933/qtbug-8933.pro +++ b/tests/manual/qtbug-8933/qtbug-8933.pro @@ -14,4 +14,3 @@ 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 6a1ca85335..81384eaf24 100644 --- a/tests/manual/qtouchevent/qtouchevent.pro +++ b/tests/manual/qtouchevent/qtouchevent.pro @@ -4,4 +4,3 @@ 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 99e96537dc..3523257f3e 100644 --- a/tests/manual/qwidget_zorder/qwidget_zorder.pro +++ b/tests/manual/qwidget_zorder/qwidget_zorder.pro @@ -1,3 +1,2 @@ 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 1fc3773864..f20e5fe402 100644 --- a/tests/manual/repaint/mainwindow/mainwindow.pro +++ b/tests/manual/repaint/mainwindow/mainwindow.pro @@ -1,4 +1,3 @@ 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 1fc3773864..f20e5fe402 100644 --- a/tests/manual/repaint/scrollarea/scrollarea.pro +++ b/tests/manual/repaint/scrollarea/scrollarea.pro @@ -1,4 +1,3 @@ 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 1fc3773864..f20e5fe402 100644 --- a/tests/manual/repaint/splitter/splitter.pro +++ b/tests/manual/repaint/splitter/splitter.pro @@ -1,4 +1,3 @@ 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 ae27c84109..6a5aaad251 100644 --- a/tests/manual/repaint/tableview/tableview.pro +++ b/tests/manual/repaint/tableview/tableview.pro @@ -1,4 +1,3 @@ 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 a7db71ba3e..b54299e540 100644 --- a/tests/manual/repaint/task141091/task141091.pro +++ b/tests/manual/repaint/task141091/task141091.pro @@ -1,4 +1,3 @@ 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 827a7e2dac..a881c24f56 100644 --- a/tests/manual/repaint/toplevel/toplevel.pro +++ b/tests/manual/repaint/toplevel/toplevel.pro @@ -3,4 +3,3 @@ 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 1fc3773864..f20e5fe402 100644 --- a/tests/manual/repaint/widget/widget.pro +++ b/tests/manual/repaint/widget/widget.pro @@ -1,4 +1,3 @@ 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 3da17c2d49..d379628669 100644 --- a/tests/manual/socketengine/socketengine.pro +++ b/tests/manual/socketengine/socketengine.pro @@ -5,4 +5,3 @@ 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 5dc8542e86..6500814423 100644 --- a/tests/manual/textrendering/glyphshaping/glyphshaping.pro +++ b/tests/manual/textrendering/glyphshaping/glyphshaping.pro @@ -4,4 +4,3 @@ 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 acfd7b1906..f07a4f0294 100644 --- a/tests/manual/textrendering/textperformance/textperformance.pro +++ b/tests/manual/textrendering/textperformance/textperformance.pro @@ -1,3 +1,2 @@ QT += widgets SOURCES = main.cpp -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/widgetgrab/widgetgrab.pro b/tests/manual/widgetgrab/widgetgrab.pro index f1d2b0e65f..d206fb1df1 100644 --- a/tests/manual/widgetgrab/widgetgrab.pro +++ b/tests/manual/widgetgrab/widgetgrab.pro @@ -6,5 +6,4 @@ SOURCES += main.cpp greaterThan(QT_MAJOR_VERSION, 4) { QT += widgets - 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 1ce6d141ab..e5c90f18ec 100644 --- a/tests/manual/widgets/itemviews/delegate/delegate.pro +++ b/tests/manual/widgets/itemviews/delegate/delegate.pro @@ -1,4 +1,3 @@ TEMPLATE = app QT += widgets SOURCES=example.cpp -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/widgets/itemviews/qheaderview/qheaderview.pro b/tests/manual/widgets/itemviews/qheaderview/qheaderview.pro index f83136266d..ac40c6e9e1 100644 --- a/tests/manual/widgets/itemviews/qheaderview/qheaderview.pro +++ b/tests/manual/widgets/itemviews/qheaderview/qheaderview.pro @@ -1,4 +1,3 @@ TEMPLATE = app SOURCES = qheaderviewtest1.cpp QT += widgets -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/widgets/itemviews/qtreeview/qtreeview.pro b/tests/manual/widgets/itemviews/qtreeview/qtreeview.pro index c241ee1045..f06006ea3a 100644 --- a/tests/manual/widgets/itemviews/qtreeview/qtreeview.pro +++ b/tests/manual/widgets/itemviews/qtreeview/qtreeview.pro @@ -1,4 +1,3 @@ TEMPLATE = app SOURCES = main.cpp QT += widgets -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/widgets/itemviews/qtreewidget/qtreewidget.pro b/tests/manual/widgets/itemviews/qtreewidget/qtreewidget.pro index 4b1da9be38..1969392ab3 100644 --- a/tests/manual/widgets/itemviews/qtreewidget/qtreewidget.pro +++ b/tests/manual/widgets/itemviews/qtreewidget/qtreewidget.pro @@ -1,4 +1,3 @@ TEMPLATE = app SOURCES = main.cpp QT += widgets core-private -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/widgets/qgraphicsview/rubberband/rubberband.pro b/tests/manual/widgets/qgraphicsview/rubberband/rubberband.pro index 805b0cc119..731756cff3 100644 --- a/tests/manual/widgets/qgraphicsview/rubberband/rubberband.pro +++ b/tests/manual/widgets/qgraphicsview/rubberband/rubberband.pro @@ -1,4 +1,3 @@ TEMPLATE = app SOURCES = rubberbandtest.cpp QT += gui widgets # core-private -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/windowflags/windowflags.pro b/tests/manual/windowflags/windowflags.pro index 546264cafc..ba0f75b65c 100644 --- a/tests/manual/windowflags/windowflags.pro +++ b/tests/manual/windowflags/windowflags.pro @@ -8,4 +8,3 @@ 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 c0c7ef0217..e717799649 100644 --- a/tests/manual/windowgeometry/windowgeometry.pro +++ b/tests/manual/windowgeometry/windowgeometry.pro @@ -7,4 +7,3 @@ INCLUDEPATH += ../windowflags SOURCES += $$PWD/main.cpp controllerwidget.cpp ../windowflags/controls.cpp HEADERS += controllerwidget.h ../windowflags/controls.h -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/windowmodality/windowmodality.pro b/tests/manual/windowmodality/windowmodality.pro index 12071fa7ee..b29e939d27 100644 --- a/tests/manual/windowmodality/windowmodality.pro +++ b/tests/manual/windowmodality/windowmodality.pro @@ -1,4 +1,3 @@ SOURCES = main.cpp FORMS = widget.ui dialog.ui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |