diff options
-rw-r--r-- | src/plugins/feedback/immersion/immersion.pro | 6 | ||||
-rw-r--r-- | src/plugins/feedback/meegotouch/meegotouch.pro | 6 | ||||
-rw-r--r-- | src/plugins/feedback/mmk/mmk.pro | 6 | ||||
-rw-r--r-- | tests/auto/qfeedbackplugin/testplugin/testplugin.pro | 5 | ||||
-rw-r--r-- | tests/auto/qfeedbackplugin/testplugin2/testplugin2.pro | 5 | ||||
-rw-r--r-- | tests/auto/qfeedbackplugin/testplugin3/testplugin3.pro | 5 |
6 files changed, 6 insertions, 27 deletions
diff --git a/src/plugins/feedback/immersion/immersion.pro b/src/plugins/feedback/immersion/immersion.pro index f570c9d..fb5a204 100644 --- a/src/plugins/feedback/immersion/immersion.pro +++ b/src/plugins/feedback/immersion/immersion.pro @@ -1,10 +1,9 @@ TARGET = qtfeedback_immersion QT = core feedback +PLUGIN_TYPE = feedback load(qt_plugin) -DESTDIR = $$QT.feedback.plugins/feedback - HEADERS += qfeedback.h SOURCES += qfeedback.cpp @@ -23,6 +22,3 @@ symbian: { symbianplugin.path = $${QT_PLUGINS_BASE_DIR}/$${PLUGIN_TYPE} DEPLOYMENT += symbianplugin } - -target.path += $$[QT_INSTALL_PLUGINS]/feedback -INSTALLS += target diff --git a/src/plugins/feedback/meegotouch/meegotouch.pro b/src/plugins/feedback/meegotouch/meegotouch.pro index 51cdd54..4e9ce25 100644 --- a/src/plugins/feedback/meegotouch/meegotouch.pro +++ b/src/plugins/feedback/meegotouch/meegotouch.pro @@ -1,14 +1,10 @@ TARGET = qtfeedback_meegotouch QT = core feedback +PLUGIN_TYPE = feedback load(qt_plugin) -DESTDIR = $$QT.feedback.plugins/feedback - HEADERS += qfeedback.h SOURCES += qfeedback.cpp LIBS += -lmeegotouchcore - -target.path += $$[QT_INSTALL_PLUGINS]/feedback -INSTALLS += target diff --git a/src/plugins/feedback/mmk/mmk.pro b/src/plugins/feedback/mmk/mmk.pro index 6dd0a41..eba7d40 100644 --- a/src/plugins/feedback/mmk/mmk.pro +++ b/src/plugins/feedback/mmk/mmk.pro @@ -1,10 +1,9 @@ TARGET = qtfeedback_mmk QT = core feedback multimedia +PLUGIN_TYPE = feedback load(qt_plugin) -DESTDIR = $$QT.feedback.plugins/feedback - HEADERS += qfeedback.h SOURCES += qfeedback.cpp @@ -22,6 +21,3 @@ symbian: { symbianplugin.path = $${QT_PLUGINS_BASE_DIR}/$${PLUGIN_TYPE} DEPLOYMENT += symbianplugin } - -target.path += $$[QT_INSTALL_PLUGINS]/feedback -INSTALLS += target diff --git a/tests/auto/qfeedbackplugin/testplugin/testplugin.pro b/tests/auto/qfeedbackplugin/testplugin/testplugin.pro index 660f33f..eb2680a 100644 --- a/tests/auto/qfeedbackplugin/testplugin/testplugin.pro +++ b/tests/auto/qfeedbackplugin/testplugin/testplugin.pro @@ -1,10 +1,9 @@ TARGET = qtfeedback_testplugin QT = core feedback +PLUGIN_TYPE = feedback load(qt_plugin) -DESTDIR = $$QT.feedback.plugins/feedback - HEADERS += qfeedbacktestplugin.h SOURCES += qfeedbacktestplugin.cpp @@ -22,6 +21,4 @@ symbian: { DEPLOYMENT += symbianplugin } -target.path += $$[QT_INSTALL_PLUGINS]/feedback -INSTALLS += target DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qfeedbackplugin/testplugin2/testplugin2.pro b/tests/auto/qfeedbackplugin/testplugin2/testplugin2.pro index a3906b5..ee0c2be 100644 --- a/tests/auto/qfeedbackplugin/testplugin2/testplugin2.pro +++ b/tests/auto/qfeedbackplugin/testplugin2/testplugin2.pro @@ -1,10 +1,9 @@ TARGET = qtfeedback_testplugin2 QT = core feedback +PLUGIN_TYPE = feedback load(qt_plugin) -DESTDIR = $$QT.feedback.plugins/feedback - CONFIG += testplugin HEADERS += qfeedbacktestplugin.h @@ -24,6 +23,4 @@ symbian: { DEPLOYMENT += symbianplugin } -target.path += $$[QT_INSTALL_PLUGINS]/feedback -INSTALLS += target DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qfeedbackplugin/testplugin3/testplugin3.pro b/tests/auto/qfeedbackplugin/testplugin3/testplugin3.pro index 3cfb773..c7a97e6 100644 --- a/tests/auto/qfeedbackplugin/testplugin3/testplugin3.pro +++ b/tests/auto/qfeedbackplugin/testplugin3/testplugin3.pro @@ -1,10 +1,9 @@ TARGET = qtfeedback_testplugin3 QT = core feedback +PLUGIN_TYPE = feedback load(qt_plugin) -DESTDIR = $$QT.feedback.plugins/feedback - INCLUDEPATH += $$QT.feedback.includes CONFIG += testplugin @@ -26,6 +25,4 @@ symbian: { DEPLOYMENT += symbianplugin } -target.path += $$[QT_INSTALL_PLUGINS]/feedback -INSTALLS += target DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |