From 672b5b7ab668c67477d36edfcda98caafd35edc0 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 1 Aug 2012 13:19:40 +0200 Subject: 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 Reviewed-by: Olivier Goffart --- .../gui/text/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro | 1 + tests/auto/gui/text/qcssparser/qcssparser.pro | 1 + tests/auto/gui/text/qfont/qfont.pro | 1 + tests/auto/gui/text/qfontdatabase/qfontdatabase.pro | 1 + tests/auto/gui/text/qfontmetrics/qfontmetrics.pro | 1 + tests/auto/gui/text/qglyphrun/qglyphrun.pro | 1 + tests/auto/gui/text/qrawfont/qrawfont.pro | 1 + tests/auto/gui/text/qstatictext/qstatictext.pro | 1 + tests/auto/gui/text/qsyntaxhighlighter/qsyntaxhighlighter.pro | 1 + tests/auto/gui/text/qtextblock/qtextblock.pro | 1 + tests/auto/gui/text/qtextcursor/qtextcursor.pro | 1 + tests/auto/gui/text/qtextdocument/qtextdocument.pro | 1 + tests/auto/gui/text/qtextdocumentfragment/qtextdocumentfragment.pro | 1 + tests/auto/gui/text/qtextdocumentlayout/qtextdocumentlayout.pro | 1 + tests/auto/gui/text/qtextformat/qtextformat.pro | 1 + tests/auto/gui/text/qtextlayout/qtextlayout.pro | 1 + tests/auto/gui/text/qtextlist/qtextlist.pro | 1 + tests/auto/gui/text/qtextobject/qtextobject.pro | 1 + tests/auto/gui/text/qtextodfwriter/qtextodfwriter.pro | 1 + tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro | 1 + tests/auto/gui/text/qtextscriptengine/generate/generate.pro | 1 + tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro | 1 + tests/auto/gui/text/qtexttable/qtexttable.pro | 1 + tests/auto/gui/text/qzip/qzip.pro | 1 + 24 files changed, 24 insertions(+) (limited to 'tests/auto/gui/text') diff --git a/tests/auto/gui/text/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro b/tests/auto/gui/text/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro index b2059119df..801e9dc7be 100644 --- a/tests/auto/gui/text/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro +++ b/tests/auto/gui/text/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro @@ -9,3 +9,4 @@ QT += testlib SOURCES += tst_qabstracttextdocumentlayout.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/text/qcssparser/qcssparser.pro b/tests/auto/gui/text/qcssparser/qcssparser.pro index 346a38d5f6..43d363dc7b 100644 --- a/tests/auto/gui/text/qcssparser/qcssparser.pro +++ b/tests/auto/gui/text/qcssparser/qcssparser.pro @@ -15,3 +15,4 @@ wince* { DEPLOYMENT += addFiles timesFont } +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/text/qfont/qfont.pro b/tests/auto/gui/text/qfont/qfont.pro index a744d52984..86178f3fa6 100644 --- a/tests/auto/gui/text/qfont/qfont.pro +++ b/tests/auto/gui/text/qfont/qfont.pro @@ -6,3 +6,4 @@ QT += testlib SOURCES += tst_qfont.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro b/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro index 527de4a751..0a99e84ed4 100644 --- a/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro +++ b/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro @@ -10,3 +10,4 @@ wince* { additionalFiles.path = . DEPLOYMENT += additionalFiles } +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/text/qfontmetrics/qfontmetrics.pro b/tests/auto/gui/text/qfontmetrics/qfontmetrics.pro index fcda664f92..ef08458c56 100644 --- a/tests/auto/gui/text/qfontmetrics/qfontmetrics.pro +++ b/tests/auto/gui/text/qfontmetrics/qfontmetrics.pro @@ -4,3 +4,4 @@ TARGET = tst_qfontmetrics QT += testlib SOURCES += tst_qfontmetrics.cpp RESOURCES += testfont.qrc +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/text/qglyphrun/qglyphrun.pro b/tests/auto/gui/text/qglyphrun/qglyphrun.pro index b913567a90..67eb1d1b2b 100644 --- a/tests/auto/gui/text/qglyphrun/qglyphrun.pro +++ b/tests/auto/gui/text/qglyphrun/qglyphrun.pro @@ -11,3 +11,4 @@ wince* { } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/text/qrawfont/qrawfont.pro b/tests/auto/gui/text/qrawfont/qrawfont.pro index cad81fcb71..b764cfbee0 100644 --- a/tests/auto/gui/text/qrawfont/qrawfont.pro +++ b/tests/auto/gui/text/qrawfont/qrawfont.pro @@ -10,3 +10,4 @@ SOURCES += \ INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src TESTDATA += testfont_bold_italic.ttf testfont.ttf +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/text/qstatictext/qstatictext.pro b/tests/auto/gui/text/qstatictext/qstatictext.pro index 2e63f5dbb1..38ab120985 100644 --- a/tests/auto/gui/text/qstatictext/qstatictext.pro +++ b/tests/auto/gui/text/qstatictext/qstatictext.pro @@ -4,3 +4,4 @@ TARGET = tst_qstatictext QT += testlib QT += core core-private gui gui-private SOURCES += tst_qstatictext.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/text/qsyntaxhighlighter/qsyntaxhighlighter.pro b/tests/auto/gui/text/qsyntaxhighlighter/qsyntaxhighlighter.pro index 690e1997fa..3f9728adf4 100644 --- a/tests/auto/gui/text/qsyntaxhighlighter/qsyntaxhighlighter.pro +++ b/tests/auto/gui/text/qsyntaxhighlighter/qsyntaxhighlighter.pro @@ -3,3 +3,4 @@ CONFIG += parallel_test TARGET = tst_qsyntaxhighlighter SOURCES += tst_qsyntaxhighlighter.cpp QT += testlib +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/text/qtextblock/qtextblock.pro b/tests/auto/gui/text/qtextblock/qtextblock.pro index 6048361f7a..ebf992469e 100644 --- a/tests/auto/gui/text/qtextblock/qtextblock.pro +++ b/tests/auto/gui/text/qtextblock/qtextblock.pro @@ -9,3 +9,4 @@ SOURCES += tst_qtextblock.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/text/qtextcursor/qtextcursor.pro b/tests/auto/gui/text/qtextcursor/qtextcursor.pro index 5e045404f1..278cf91cc8 100644 --- a/tests/auto/gui/text/qtextcursor/qtextcursor.pro +++ b/tests/auto/gui/text/qtextcursor/qtextcursor.pro @@ -3,3 +3,4 @@ CONFIG += parallel_test TARGET = tst_qtextcursor SOURCES += tst_qtextcursor.cpp QT += testlib +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/text/qtextdocument/qtextdocument.pro b/tests/auto/gui/text/qtextdocument/qtextdocument.pro index 1f06e297f2..c995fee678 100644 --- a/tests/auto/gui/text/qtextdocument/qtextdocument.pro +++ b/tests/auto/gui/text/qtextdocument/qtextdocument.pro @@ -5,3 +5,4 @@ HEADERS += common.h SOURCES += tst_qtextdocument.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/text/qtextdocumentfragment/qtextdocumentfragment.pro b/tests/auto/gui/text/qtextdocumentfragment/qtextdocumentfragment.pro index da8d120c69..5aee639da6 100644 --- a/tests/auto/gui/text/qtextdocumentfragment/qtextdocumentfragment.pro +++ b/tests/auto/gui/text/qtextdocumentfragment/qtextdocumentfragment.pro @@ -7,3 +7,4 @@ SOURCES += tst_qtextdocumentfragment.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/text/qtextdocumentlayout/qtextdocumentlayout.pro b/tests/auto/gui/text/qtextdocumentlayout/qtextdocumentlayout.pro index 1ebbd8a7bf..d439e0deb9 100644 --- a/tests/auto/gui/text/qtextdocumentlayout/qtextdocumentlayout.pro +++ b/tests/auto/gui/text/qtextdocumentlayout/qtextdocumentlayout.pro @@ -6,3 +6,4 @@ QT += testlib SOURCES += tst_qtextdocumentlayout.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/text/qtextformat/qtextformat.pro b/tests/auto/gui/text/qtextformat/qtextformat.pro index b137dac9eb..4689ecb982 100644 --- a/tests/auto/gui/text/qtextformat/qtextformat.pro +++ b/tests/auto/gui/text/qtextformat/qtextformat.pro @@ -3,3 +3,4 @@ CONFIG += parallel_test TARGET = tst_qtextformat QT += testlib SOURCES += tst_qtextformat.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/text/qtextlayout/qtextlayout.pro b/tests/auto/gui/text/qtextlayout/qtextlayout.pro index f35239bc6a..696fae0a9c 100644 --- a/tests/auto/gui/text/qtextlayout/qtextlayout.pro +++ b/tests/auto/gui/text/qtextlayout/qtextlayout.pro @@ -5,3 +5,4 @@ HEADERS += SOURCES += tst_qtextlayout.cpp DEFINES += QT_COMPILES_IN_HARFBUZZ INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/text/qtextlist/qtextlist.pro b/tests/auto/gui/text/qtextlist/qtextlist.pro index b837f1f81b..ef33e182c0 100644 --- a/tests/auto/gui/text/qtextlist/qtextlist.pro +++ b/tests/auto/gui/text/qtextlist/qtextlist.pro @@ -9,3 +9,4 @@ HEADERS += ../qtextdocument/common.h +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/text/qtextobject/qtextobject.pro b/tests/auto/gui/text/qtextobject/qtextobject.pro index 59d0e51e42..59312ac1d5 100644 --- a/tests/auto/gui/text/qtextobject/qtextobject.pro +++ b/tests/auto/gui/text/qtextobject/qtextobject.pro @@ -10,3 +10,4 @@ QT += testlib SOURCES += tst_qtextobject.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/text/qtextodfwriter/qtextodfwriter.pro b/tests/auto/gui/text/qtextodfwriter/qtextodfwriter.pro index 2c8bb39f6d..afbf86cbfe 100644 --- a/tests/auto/gui/text/qtextodfwriter/qtextodfwriter.pro +++ b/tests/auto/gui/text/qtextodfwriter/qtextodfwriter.pro @@ -4,3 +4,4 @@ QT += core-private gui-private testlib SOURCES += tst_qtextodfwriter.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro b/tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro index 1419e32012..344d643201 100644 --- a/tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro +++ b/tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro @@ -8,3 +8,4 @@ HEADERS += ../qtextdocument/common.h requires(!win32) requires(contains(QT_CONFIG,private_tests)) +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/text/qtextscriptengine/generate/generate.pro b/tests/auto/gui/text/qtextscriptengine/generate/generate.pro index 101b7451de..94500e4195 100644 --- a/tests/auto/gui/text/qtextscriptengine/generate/generate.pro +++ b/tests/auto/gui/text/qtextscriptengine/generate/generate.pro @@ -3,3 +3,4 @@ INCLUDEPATH += . /usr/include/freetype2 INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro b/tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro index f7cee97387..37eab00c8d 100644 --- a/tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro +++ b/tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro @@ -7,3 +7,4 @@ QT += core-private gui-private testlib HEADERS += SOURCES += tst_qtextscriptengine.cpp INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/text/qtexttable/qtexttable.pro b/tests/auto/gui/text/qtexttable/qtexttable.pro index 4307849d22..a1034dac67 100644 --- a/tests/auto/gui/text/qtexttable/qtexttable.pro +++ b/tests/auto/gui/text/qtexttable/qtexttable.pro @@ -7,3 +7,4 @@ SOURCES += tst_qtexttable.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/text/qzip/qzip.pro b/tests/auto/gui/text/qzip/qzip.pro index 309f2167d1..479f48ff1d 100644 --- a/tests/auto/gui/text/qzip/qzip.pro +++ b/tests/auto/gui/text/qzip/qzip.pro @@ -11,3 +11,4 @@ wince* { } else { DEFINES += SRCDIR=\\\"$$PWD\\\" } +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 -- cgit v1.2.3