From 9b5b7ee332a5109827074bcd5522f833add9f54c Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 22 Jun 2012 15:03:31 +1000 Subject: Cleanup last Symbian remnants in QtSensors Change-Id: I35eb858cad41167ac6bbbf17e48571965f34f8ca Reviewed-by: Lorn Potter --- src/imports/sensors/qsensorsimport.pri | 7 ------- src/imports/sensors/sensors.pro | 13 ------------- src/imports/sensors2/qsensors2import.pri | 7 ------- src/imports/sensors2/sensors2.pro | 13 ------------- src/plugins/sensors/generic/generic.pro | 10 ---------- src/plugins/sensors/simulator/simulator.pro | 2 -- src/sensors/sensors.pro | 17 ----------------- 7 files changed, 69 deletions(-) (limited to 'src') diff --git a/src/imports/sensors/qsensorsimport.pri b/src/imports/sensors/qsensorsimport.pri index d5cfeffc..f8be980b 100644 --- a/src/imports/sensors/qsensorsimport.pri +++ b/src/imports/sensors/qsensorsimport.pri @@ -1,6 +1,5 @@ load(qt_module) -symbian:load(qt_plugin) TEMPLATE = lib CONFIG += qt plugin @@ -30,9 +29,3 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols load(qt_targets) wince*:LIBS += $$QMAKE_LIBS_GUI - -symbian: { - TARGET.EPOCALLOWDLLDATA=1 - TARGET.CAPABILITY = All -Tcb - load(armcc_warnings) -} diff --git a/src/imports/sensors/sensors.pro b/src/imports/sensors/sensors.pro index 72ebb871..d470ece2 100644 --- a/src/imports/sensors/sensors.pro +++ b/src/imports/sensors/sensors.pro @@ -18,18 +18,5 @@ qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH INSTALLS += target qmldir -symbian { - # In Symbian, a library should enjoy _largest_ possible capability set. - TARGET.CAPABILITY = ALL -TCB - # Allow writable DLL data - TARGET.EPOCALLOWDLLDATA = 1 - # Target UID, makes every Symbian app unique - TARGET.UID3 = 0x20021324 - # Specifies what files shall be deployed: the plugin itself and the qmldir file. - importFiles.sources = $$DESTDIR/declarative_sensors$${QT_LIBINFIX}.dll qmldir - importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH - DEPLOYMENT = importFiles -} - OTHER_FILES += \ plugin.json qmldir plugin.qmltypes diff --git a/src/imports/sensors2/qsensors2import.pri b/src/imports/sensors2/qsensors2import.pri index d5cfeffc..f8be980b 100644 --- a/src/imports/sensors2/qsensors2import.pri +++ b/src/imports/sensors2/qsensors2import.pri @@ -1,6 +1,5 @@ load(qt_module) -symbian:load(qt_plugin) TEMPLATE = lib CONFIG += qt plugin @@ -30,9 +29,3 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols load(qt_targets) wince*:LIBS += $$QMAKE_LIBS_GUI - -symbian: { - TARGET.EPOCALLOWDLLDATA=1 - TARGET.CAPABILITY = All -Tcb - load(armcc_warnings) -} diff --git a/src/imports/sensors2/sensors2.pro b/src/imports/sensors2/sensors2.pro index 6779878c..fb6be47e 100644 --- a/src/imports/sensors2/sensors2.pro +++ b/src/imports/sensors2/sensors2.pro @@ -29,19 +29,6 @@ qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH INSTALLS += target qmldir -symbian { - # In Symbian, a library should enjoy _largest_ possible capability set. - TARGET.CAPABILITY = ALL -TCB - # Allow writable DLL data - TARGET.EPOCALLOWDLLDATA = 1 - # Target UID, makes every Symbian app unique - TARGET.UID3 = 0x20021324 - # Specifies what files shall be deployed: the plugin itself and the qmldir file. - importFiles.sources = $$DESTDIR/declarative_sensors$${QT_LIBINFIX}.dll qmldir - importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH - DEPLOYMENT = importFiles - } - OTHER_FILES += \ plugin.json qmldir plugin.qmltypes diff --git a/src/plugins/sensors/generic/generic.pro b/src/plugins/sensors/generic/generic.pro index c5b2bab7..e33ac4eb 100644 --- a/src/plugins/sensors/generic/generic.pro +++ b/src/plugins/sensors/generic/generic.pro @@ -18,15 +18,5 @@ SOURCES += genericorientationsensor.cpp\ OTHER_FILES = plugin.json -symbian { - TARGET.EPOCALLOWDLLDATA = 1 - TARGET.UID3 = 0x2002BFC3 - TARGET.CAPABILITY = ALL -TCB - - pluginDep.sources = $${TARGET}.dll - pluginDep.path = $${QT_PLUGINS_BASE_DIR}/$${PLUGIN_TYPE} - DEPLOYMENT += pluginDep -} - target.path += $$[QT_INSTALL_PLUGINS]/sensors INSTALLS += target diff --git a/src/plugins/sensors/simulator/simulator.pro b/src/plugins/sensors/simulator/simulator.pro index 56bfb18f..75da1cd6 100644 --- a/src/plugins/sensors/simulator/simulator.pro +++ b/src/plugins/sensors/simulator/simulator.pro @@ -5,8 +5,6 @@ load(qt_plugin) DESTDIR = $$QT.sensors.plugins/sensors -symbian:TARGET.EPOCALLOWDLLDATA = 1 - QT=core gui network sensors simulator target.path += $$[QT_INSTALL_PLUGINS]/sensors diff --git a/src/sensors/sensors.pro b/src/sensors/sensors.pro index c10e5b1e..cfba0f1e 100644 --- a/src/sensors/sensors.pro +++ b/src/sensors/sensors.pro @@ -24,23 +24,6 @@ HEADERS += qtsensorsversion.h QMAKE_DOCS = $$PWD/../../doc/config/qtsensors.qdocconf -symbian { - TARGET.CAPABILITY = ALL -TCB - TARGET.UID3 = 0x2002BFC0 - - ### Sensors - # Main library - SENSORS_DEPLOYMENT.sources = QtSensors.dll - SENSORS_DEPLOYMENT.path = /sys/bin - DEPLOYMENT += SENSORS_DEPLOYMENT - LIBS += -lefsrv - - # We break on Symbian^3 unless we have this include (normally obtained by linking to QtGui) - load(platform_paths) - INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE - -} - PUBLIC_HEADERS += \ qsensorbackend.h\ qsensormanager.h\ -- cgit v1.2.3