From dd4220b6e65097236753c1b64af82fc53a979911 Mon Sep 17 00:00:00 2001 From: Debao Zhang Date: Fri, 22 Mar 2013 14:03:43 +0800 Subject: QtGui tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 Change-Id: I48c83fa0c5eccd86a5242fc8ed51ac6d7623f7f3 Reviewed-by: Friedemann Kleint --- tests/auto/gui/image/qicoimageformat/qicoimageformat.pro | 1 - tests/auto/gui/image/qicon/qicon.pro | 1 - tests/auto/gui/image/qimage/qimage.pro | 1 - tests/auto/gui/image/qimageiohandler/qimageiohandler.pro | 1 - tests/auto/gui/image/qimagereader/qimagereader.pro | 1 - tests/auto/gui/image/qimagewriter/qimagewriter.pro | 1 - tests/auto/gui/image/qmovie/qmovie.pro | 1 - tests/auto/gui/image/qpicture/qpicture.pro | 1 - tests/auto/gui/image/qpixmap/qpixmap.pro | 1 - tests/auto/gui/image/qpixmapcache/qpixmapcache.pro | 1 - 10 files changed, 10 deletions(-) (limited to 'tests/auto/gui/image') diff --git a/tests/auto/gui/image/qicoimageformat/qicoimageformat.pro b/tests/auto/gui/image/qicoimageformat/qicoimageformat.pro index 41f7fb626e..83af3960a6 100644 --- a/tests/auto/gui/image/qicoimageformat/qicoimageformat.pro +++ b/tests/auto/gui/image/qicoimageformat/qicoimageformat.pro @@ -14,4 +14,3 @@ wince*: { DEPLOYMENT += addPlugins } TESTDATA += icons/* -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/image/qicon/qicon.pro b/tests/auto/gui/image/qicon/qicon.pro index 337b938915..f48fe90dd8 100644 --- a/tests/auto/gui/image/qicon/qicon.pro +++ b/tests/auto/gui/image/qicon/qicon.pro @@ -8,4 +8,3 @@ SOURCES += tst_qicon.cpp RESOURCES = tst_qicon.qrc TESTDATA += icons/* *.png *.svg *.svgz -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/image/qimage/qimage.pro b/tests/auto/gui/image/qimage/qimage.pro index f7b1e4001a..467a59ec9f 100644 --- a/tests/auto/gui/image/qimage/qimage.pro +++ b/tests/auto/gui/image/qimage/qimage.pro @@ -6,4 +6,3 @@ SOURCES += tst_qimage.cpp QT += core-private gui-private testlib TESTDATA += images/* -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/image/qimageiohandler/qimageiohandler.pro b/tests/auto/gui/image/qimageiohandler/qimageiohandler.pro index 43507d9336..bbcf8d23c9 100644 --- a/tests/auto/gui/image/qimageiohandler/qimageiohandler.pro +++ b/tests/auto/gui/image/qimageiohandler/qimageiohandler.pro @@ -6,4 +6,3 @@ QT += testlib SOURCES += tst_qimageiohandler.cpp -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/image/qimagereader/qimagereader.pro b/tests/auto/gui/image/qimagereader/qimagereader.pro index 432d3db19a..7686643b3a 100644 --- a/tests/auto/gui/image/qimagereader/qimagereader.pro +++ b/tests/auto/gui/image/qimagereader/qimagereader.pro @@ -11,4 +11,3 @@ win32-msvc.net:QMAKE_CXXFLAGS -= -Zm300 win32-msvc.net:QMAKE_CXXFLAGS += -Zm1100 TESTDATA += images/* baseline/* -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/image/qimagewriter/qimagewriter.pro b/tests/auto/gui/image/qimagewriter/qimagewriter.pro index 3006bfe09e..f77ff0659b 100644 --- a/tests/auto/gui/image/qimagewriter/qimagewriter.pro +++ b/tests/auto/gui/image/qimagewriter/qimagewriter.pro @@ -7,4 +7,3 @@ win32-msvc:QMAKE_CXXFLAGS -= -Zm200 win32-msvc:QMAKE_CXXFLAGS += -Zm800 TESTDATA += images/* -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/image/qmovie/qmovie.pro b/tests/auto/gui/image/qmovie/qmovie.pro index 9290588625..4e7030b1f7 100644 --- a/tests/auto/gui/image/qmovie/qmovie.pro +++ b/tests/auto/gui/image/qmovie/qmovie.pro @@ -11,4 +11,3 @@ MOC_DIR=tmp RESOURCES += resources.qrc TESTDATA += animations/* -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/image/qpicture/qpicture.pro b/tests/auto/gui/image/qpicture/qpicture.pro index b4927b4536..a24b8ec481 100644 --- a/tests/auto/gui/image/qpicture/qpicture.pro +++ b/tests/auto/gui/image/qpicture/qpicture.pro @@ -7,4 +7,3 @@ SOURCES += tst_qpicture.cpp -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/image/qpixmap/qpixmap.pro b/tests/auto/gui/image/qpixmap/qpixmap.pro index 6188bf2c6e..bdd0c15788 100644 --- a/tests/auto/gui/image/qpixmap/qpixmap.pro +++ b/tests/auto/gui/image/qpixmap/qpixmap.pro @@ -11,4 +11,3 @@ SOURCES += tst_qpixmap.cpp RESOURCES += qpixmap.qrc TESTDATA += convertFromImage/* convertFromToHICON/* loadFromData/* images/* -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/image/qpixmapcache/qpixmapcache.pro b/tests/auto/gui/image/qpixmapcache/qpixmapcache.pro index c332497783..a81712ba23 100644 --- a/tests/auto/gui/image/qpixmapcache/qpixmapcache.pro +++ b/tests/auto/gui/image/qpixmapcache/qpixmapcache.pro @@ -6,4 +6,3 @@ SOURCES += tst_qpixmapcache.cpp -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 -- cgit v1.2.3