--- a/qtmobility/common.pri Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/common.pri Fri Jun 11 14:26:25 2010 +0300
@@ -92,8 +92,14 @@
DESTDIR = $$OUTPUT_DIR/bin
}
} else {
- testplugin:DESTDIR = $$OUTPUT_DIR/build/tests/bin/plugins/$$PLUGIN_TYPE
- !testplugin:DESTDIR = $$OUTPUT_DIR/plugins/$$PLUGIN_TYPE
+ testplugin {
+ DESTDIR = $$OUTPUT_DIR/build/tests/bin/plugins/$$PLUGIN_TYPE
+ } else {
+ #check that plugin_type is set or warn otherwise
+ isEmpty(PLUGIN_TYPE):message(PLUGIN_TYPE not specified - install rule may not work)
+ target.path=$${QT_MOBILITY_PLUGINS}/$${PLUGIN_TYPE}
+ INSTALLS += target
+ }
}
MOC_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/moc
@@ -169,4 +175,4 @@
DEPENDPATH += . $$SOURCE_DIR
INCLUDEPATH += $$SOURCE_DIR/src/global
-!symbian:!wince*:DEFINES += QTM_PLUGIN_PATH=\\\"$$replace(QT_MOBILITY_PREFIX, \\\\, /)\\\"
+!symbian:!wince*:DEFINES += QTM_PLUGIN_PATH=\\\"$$replace(QT_MOBILITY_PLUGINS, \\\\, /)\\\"