diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-03-10 13:16:57 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-03-10 13:42:54 +0000 |
| commit | 634ab5bfd3d210b69cbc1cd1a124bc95cd6849fe (patch) | |
| tree | 0ad513a5c4c8bd9b74c098cd31f19e8db8e01391 /tests | |
| parent | 89e9f88bae26fe2ed99b59489ea7aef29c07336b (diff) | |
Remove Windows CE.
Remove #ifdef sections for Q_OS_WINCE, wince .pro file clauses and
the CE-specific test library.
Task-number: QTBUG-51673
Change-Id: I9dbcca9c9b6febe67a7c5b5d2cee0b1ab1f302f7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/auto.pro | 4 | ||||
| -rw-r--r-- | tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro | 17 | ||||
| -rw-r--r-- | tests/auto/qhelpenginecore/qhelpenginecore.pro | 17 |
3 files changed, 4 insertions, 34 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 20b5fec90..e156e3c2c 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -24,5 +24,5 @@ cross_compile:SUBDIRS -= linguist qhelpindexmodel \ qhelpprojectdata \ -android|ios|qnx|wince*|winrt*:SUBDIRS -= qtdiag -!win32|wince*|winrt*:SUBDIRS -= windeployqt +android|ios|qnx|winrt: SUBDIRS -= qtdiag +!win32|winrt: SUBDIRS -= windeployqt diff --git a/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro b/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro index 13a7d47bb..7fb9f6585 100644 --- a/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro +++ b/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro @@ -3,19 +3,4 @@ CONFIG += testcase QT += help testlib SOURCES += tst_qhelpcontentmodel.cpp -DEFINES += QT_USE_USING_NAMESPACE - -wince*: { - DEFINES += SRCDIR=\\\"./\\\" - QT += network - addFiles.files = $$PWD/data/*.* - addFiles.path = data - clucene.files = $$QT.clucene.libs/QtCLucene*.dll - - DEPLOYMENT += addFiles - DEPLOYMENT += clucene - - DEPLOYMENT_PLUGIN += qsqlite -} else { - DEFINES += SRCDIR=\\\"$$PWD\\\" -} +DEFINES += QT_USE_USING_NAMESPACE SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/qhelpenginecore/qhelpenginecore.pro b/tests/auto/qhelpenginecore/qhelpenginecore.pro index 4fa425838..e6fc35074 100644 --- a/tests/auto/qhelpenginecore/qhelpenginecore.pro +++ b/tests/auto/qhelpenginecore/qhelpenginecore.pro @@ -4,19 +4,4 @@ SOURCES += tst_qhelpenginecore.cpp QT += help sql testlib help -DEFINES += QT_USE_USING_NAMESPACE - -wince*: { - DEFINES += SRCDIR=\\\"./\\\" - QT += network - addFiles.files = $$PWD/data/*.* - addFiles.path = data - clucene.files = $$QT.clucene.libs/QtCLucene*.dll - - DEPLOYMENT += addFiles - DEPLOYMENT += clucene - - DEPLOYMENT_PLUGIN += qsqlite -} else { - DEFINES += SRCDIR=\\\"$$PWD\\\" -} +DEFINES += QT_USE_USING_NAMESPACE SRCDIR=\\\"$$PWD\\\" |