summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-08-01 15:55:00 +0200
committerThiago Macieira <thiago.macieira@intel.com>2012-08-01 22:28:09 +0200
commit1cc17e33c545f1152b4a9e8684855790cefb2994 (patch)
treed79caefe28b571ec6e6ce09f5e42dc6e8a4c8bed
parent496180637b18243f92e81bd0430e193de20a5142 (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: I17b02c252bea56c265d6e80359628fa02dba3525 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
-rw-r--r--src/qftp/qftp.pro1
-rw-r--r--tests/auto/headersclean/headersclean.pro1
-rw-r--r--tests/auto/qftp/qftp.pro1
3 files changed, 3 insertions, 0 deletions
diff --git a/src/qftp/qftp.pro b/src/qftp/qftp.pro
index 558afda..74f1803 100644
--- a/src/qftp/qftp.pro
+++ b/src/qftp/qftp.pro
@@ -14,3 +14,4 @@ load(qt_module_config)
# Input
HEADERS += qftp.h qurlinfo.h
SOURCES += qftp.cpp qurlinfo.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro
index 314fd86..2f9b87d 100644
--- a/tests/auto/headersclean/headersclean.pro
+++ b/tests/auto/headersclean/headersclean.pro
@@ -1,2 +1,3 @@
QT = core testlib ftp
include($${QT.core.sources}/../../tests/auto/other/headersclean/headersclean.pri)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qftp/qftp.pro b/tests/auto/qftp/qftp.pro
index 4b0f5c8..818ec81 100644
--- a/tests/auto/qftp/qftp.pro
+++ b/tests/auto/qftp/qftp.pro
@@ -15,3 +15,4 @@ wince*: {
}
CONFIG+=insignificant_test # uses live qt-test-server, inherently unstable
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0