diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-03 21:36:17 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-04 12:40:34 +0100 |
commit | c9e2d01358ff218ea1bcfb4bebc2169d02ebe82e (patch) | |
tree | 06073f2833eb2a78b7b554bcb5a5897104361829 /tests | |
parent | d22ba2dd01113b84425aa4fa594e8c7b136e68a6 (diff) |
remove symbian vestiges
Change-Id: I2841caece488ac2df959a26a47d245756b4d06a5
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'tests')
7 files changed, 4 insertions, 52 deletions
diff --git a/tests/auto/qdeclarativefeedback/qdeclarativefeedback.pro b/tests/auto/qdeclarativefeedback/qdeclarativefeedback.pro index f436a70..1d215d5 100644 --- a/tests/auto/qdeclarativefeedback/qdeclarativefeedback.pro +++ b/tests/auto/qdeclarativefeedback/qdeclarativefeedback.pro @@ -4,13 +4,7 @@ QT += qml feedback network SOURCES += tst_qdeclarativefeedback.cpp -symbian: { - importFiles.sources = data - importFiles.path = . - DEPLOYMENT += importFiles -} else { - DEFINES += SRCDIR=\\\"$$PWD\\\" -} +DEFINES += SRCDIR=\\\"$$PWD\\\" OTHER_FILES += \ data/hapticseffect.qml \ diff --git a/tests/auto/qfeedbackactuator/qfeedbackactuator.pro b/tests/auto/qfeedbackactuator/qfeedbackactuator.pro index fe8c482..190fc10 100644 --- a/tests/auto/qfeedbackactuator/qfeedbackactuator.pro +++ b/tests/auto/qfeedbackactuator/qfeedbackactuator.pro @@ -4,5 +4,5 @@ QT += feedback SOURCES += tst_qfeedbackactuator.cpp -symbian|linux-g++-maemo:DEFINES += HAVE_ACTUATORS +linux-g++-maemo:DEFINES += HAVE_ACTUATORS DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qfeedbackmmk/qfeedbackmmk.pro b/tests/auto/qfeedbackmmk/qfeedbackmmk.pro index a90f4a1..2c1c8de 100644 --- a/tests/auto/qfeedbackmmk/qfeedbackmmk.pro +++ b/tests/auto/qfeedbackmmk/qfeedbackmmk.pro @@ -4,7 +4,7 @@ QT += feedback SOURCES += tst_qfeedbackmmk.cpp -wince*|symbian { +wince* { deploy.files = test.wav DEPLOYMENT = deploy DEFINES += QT_QFEEDBACKMMK_USEAPPLICATIONPATH diff --git a/tests/auto/qfeedbackplugin/testplugin/testplugin.pro b/tests/auto/qfeedbackplugin/testplugin/testplugin.pro index eb2680a..774a82a 100644 --- a/tests/auto/qfeedbackplugin/testplugin/testplugin.pro +++ b/tests/auto/qfeedbackplugin/testplugin/testplugin.pro @@ -7,18 +7,4 @@ load(qt_plugin) HEADERS += qfeedbacktestplugin.h SOURCES += qfeedbacktestplugin.cpp -symbian: { - TARGET.EPOCALLOWDLLDATA=1 - TARGET.CAPABILITY = All -Tcb - TARGET = $${TARGET}$${QT_LIBINFIX} - load(armcc_warnings) - - target.path = /sys/bin - INSTALLS += target - - symbianplugin.sources = $${TARGET}.dll - symbianplugin.path = $${QT_PLUGINS_BASE_DIR}/$${PLUGIN_TYPE} - DEPLOYMENT += symbianplugin -} - DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qfeedbackplugin/testplugin2/testplugin2.pro b/tests/auto/qfeedbackplugin/testplugin2/testplugin2.pro index ee0c2be..4097137 100644 --- a/tests/auto/qfeedbackplugin/testplugin2/testplugin2.pro +++ b/tests/auto/qfeedbackplugin/testplugin2/testplugin2.pro @@ -9,18 +9,4 @@ CONFIG += testplugin HEADERS += qfeedbacktestplugin.h SOURCES += qfeedbacktestplugin.cpp -symbian: { - TARGET.EPOCALLOWDLLDATA=1 - TARGET.CAPABILITY = All -Tcb - TARGET = $${TARGET}$${QT_LIBINFIX} - load(armcc_warnings) - - target.path = /sys/bin - INSTALLS += target - - symbianplugin.sources = $${TARGET}.dll - symbianplugin.path = $${QT_PLUGINS_BASE_DIR}/$${PLUGIN_TYPE} - DEPLOYMENT += symbianplugin -} - DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qfeedbackplugin/testplugin3/testplugin3.pro b/tests/auto/qfeedbackplugin/testplugin3/testplugin3.pro index c7a97e6..63b9dd7 100644 --- a/tests/auto/qfeedbackplugin/testplugin3/testplugin3.pro +++ b/tests/auto/qfeedbackplugin/testplugin3/testplugin3.pro @@ -11,18 +11,4 @@ CONFIG += testplugin HEADERS += qfeedbacktestplugin.h SOURCES += qfeedbacktestplugin.cpp -symbian: { - TARGET.EPOCALLOWDLLDATA=1 - TARGET.CAPABILITY = All -Tcb - TARGET = $${TARGET}$${QT_LIBINFIX} - load(armcc_warnings) - - target.path = /sys/bin - INSTALLS += target - - symbianplugin.sources = $${TARGET}.dll - symbianplugin.path = $${QT_PLUGINS_BASE_DIR}/$${PLUGIN_TYPE} - DEPLOYMENT += symbianplugin -} - DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qfeedbackplugin/unittest/unittest.pro b/tests/auto/qfeedbackplugin/unittest/unittest.pro index 20b7e17..15207b9 100644 --- a/tests/auto/qfeedbackplugin/unittest/unittest.pro +++ b/tests/auto/qfeedbackplugin/unittest/unittest.pro @@ -4,5 +4,5 @@ QT += feedback SOURCES += tst_qfeedbackplugin.cpp -symbian|linux-g++-maemo:DEFINES += HAVE_ACTUATORS +linux-g++-maemo:DEFINES += HAVE_ACTUATORS DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |