Fixed the target installation path

7 files changed, 15 insertions, 51 deletions

diff --git a/libqtslave/libqtslave.pro b/libqtslave/libqtslave.pro
index eba1752..c53fb8c 100644
--- a/libqtslave/libqtslave.pro
+++ b/libqtslave/libqtslave.pro
@@ -50,6 +50,7 @@ SOURCES += \
         qtestwidgets.cpp
 
 maemo5|maemo6 {
-    target.path = /usr/local/lib
+    target.path = $$[QT_INSTALL_LIBS]
+    message ( --------------------------------- ---------------- $$[QT_INSTALL_LIBS])
     INSTALLS += target
 }
diff --git a/libqtuitest/libqtuitest.pro b/libqtuitest/libqtuitest.pro
index 8540bfb..3f96f64 100644
--- a/libqtuitest/libqtuitest.pro
+++ b/libqtuitest/libqtuitest.pro
@@ -84,6 +84,6 @@ TARGET=$$qtLibraryTarget($$TARGET)
 CONFIG-=debug_and_release_target
 
 maemo5|maemo6 {
-    target.path = /usr/local/lib
-    INSTALLS += target
+    target.path=$$[QT_INSTALL_LIBS]
+    INSTALLS+=target
 }
diff --git a/plugins/qtuitest_widgets/hbwidgets/hbwidgets.pro b/plugins/qtuitest_widgets/hbwidgets/hbwidgets.pro
index cce04df..ff5dd3a 100644
--- a/plugins/qtuitest_widgets/hbwidgets/hbwidgets.pro
+++ b/plugins/qtuitest_widgets/hbwidgets/hbwidgets.pro
@@ -33,11 +33,11 @@ TARGET=$$qtLibraryTarget($$TARGET)
 
 include($$SRCROOT/libqtuitest/libqtuitest.pri)
 
+target.path=$$[QT_INSTALL_PLUGINS]/qtuitest_widgets
+
 unix:!symbian {
     MOC_DIR=$$OUT_PWD/.moc
     OBJECTS_DIR=$$OUT_PWD/.obj
-    target.path=$$[QT_INSTALL_PLUGINS]/qtuitest_widgets
-    INSTALLS+=target
 }
 
 symbian {
@@ -46,12 +46,4 @@ symbian {
     OBJECTS_DIR=$$OUT_PWD/obj
 }
 
-win32 {
-    target.path=$$[QT_INSTALL_PLUGINS]/qtuitest_widgets
-    INSTALLS+=target
-}
-
-maemo5|maemo6 {
-    target.path = /usr/local/lib
-    INSTALLS += target
-}
+INSTALLS+=target
diff --git a/plugins/qtuitest_widgets/qgraphicsviewwidgets/qgraphicsviewwidgets.pro b/plugins/qtuitest_widgets/qgraphicsviewwidgets/qgraphicsviewwidgets.pro
index 7291b58..9b0e7bc 100644
--- a/plugins/qtuitest_widgets/qgraphicsviewwidgets/qgraphicsviewwidgets.pro
+++ b/plugins/qtuitest_widgets/qgraphicsviewwidgets/qgraphicsviewwidgets.pro
@@ -23,11 +23,11 @@ TARGET=$$qtLibraryTarget($$TARGET)
 
 include($$SRCROOT/libqtuitest/libqtuitest.pri)
 
+target.path=$$[QT_INSTALL_PLUGINS]/qtuitest_widgets
+
 unix:!symbian {
     MOC_DIR=$$OUT_PWD/.moc
     OBJECTS_DIR=$$OUT_PWD/.obj
-    target.path=$$[QT_INSTALL_PLUGINS]/qtuitest_widgets
-    INSTALLS+=target
 }
 
 symbian {
@@ -35,14 +35,4 @@ symbian {
     MOC_DIR=$$OUT_PWD/moc
     OBJECTS_DIR=$$OUT_PWD/obj
 }
-
-win32 {
-    target.path=$$[QT_INSTALL_PLUGINS]/qtuitest_widgets
-    INSTALLS+=target
-}
-
-
-maemo5|maemo6 {
-    target.path = /usr/local/lib
-    INSTALLS += target
-}
+INSTALLS += target
diff --git a/plugins/qtuitest_widgets/qtwidgets/qtwidgets.pro b/plugins/qtuitest_widgets/qtwidgets/qtwidgets.pro
index 111d326..986f04e 100644
--- a/plugins/qtuitest_widgets/qtwidgets/qtwidgets.pro
+++ b/plugins/qtuitest_widgets/qtwidgets/qtwidgets.pro
@@ -70,11 +70,11 @@ TARGET=$$qtLibraryTarget($$TARGET)
 
 include($$SRCROOT/libqtuitest/libqtuitest.pri)
 
+
+target.path=$$[QT_INSTALL_PLUGINS]/qtuitest_widgets
 unix:!symbian {
     MOC_DIR=$$OUT_PWD/.moc
     OBJECTS_DIR=$$OUT_PWD/.obj
-    target.path=$$[QT_INSTALL_PLUGINS]/qtuitest_widgets
-    INSTALLS+=target
 }
 
 symbian {
@@ -84,11 +84,7 @@ symbian {
     OBJECTS_DIR=$$OUT_PWD/obj
     LIBS+= -lws32 -leuser -lcone
 }
-
-win32 {
-    target.path=$$[QT_INSTALL_PLUGINS]/qtuitest_widgets
-    INSTALLS+=target
-}
+INSTALLS += target
 
 contains(QT_CONFIG, webkit) {
     QT+=webkit
@@ -97,7 +93,3 @@ contains(QT_CONFIG, webkit) {
 }
 
 
-maemo5|maemo6 {
-    target.path = /usr/local/lib
-    INSTALLS += target
-}
diff --git a/plugins/styles/qtuitest/qtuitest.pro b/plugins/styles/qtuitest/qtuitest.pro
index 3d071aa..b9f94bc 100644
--- a/plugins/styles/qtuitest/qtuitest.pro
+++ b/plugins/styles/qtuitest/qtuitest.pro
@@ -11,10 +11,10 @@ DEPENDPATH+=$$SRCROOT
 
 include($$SRCROOT/libqtuitest/libqtuitest.pri)
 
+target.path=$$[QT_INSTALL_PLUGINS]/styles
 unix:!symbian {
     MOC_DIR=$$OUT_PWD/.moc
     OBJECTS_DIR=$$OUT_PWD/.obj
-    target.path=$$[QT_INSTALL_PLUGINS]/styles
     INSTALLS+=target
     !mac {
         LIBS+=-L$$BUILDROOT/lib -lqtslave
@@ -32,18 +32,11 @@ symbian {
 mac {
     CONFIG(debug,debug|release): LIBS += -L$$BUILDROOT/lib -lqtslave_debug
     CONFIG(release,debug|release): LIBS += -L$$BUILDROOT/lib -lqtslave
-    target.path=$$[QT_INSTALL_PLUGINS]/styles
-    INSTALLS+=target
 }
 
 win32 {
     CONFIG(debug,debug|release):  LIBS+= -L$$BUILDROOT/libqtslave/debug -lqtslaved
     CONFIG(release,debug|release):LIBS+= -L$$BUILDROOT/libqtslave/release -lqtslave
-    target.path=$$[QT_INSTALL_PLUGINS]/styles
-    INSTALLS+=target
 }
 
-maemo5|maemo6 {
-    target.path = /usr/local/lib
-    INSTALLS += target
-}
+INSTALLS += target
diff --git a/qtbindings/qtscript_core/qtscript_core.pro b/qtbindings/qtscript_core/qtscript_core.pro
index e273685..3eec767 100644
--- a/qtbindings/qtscript_core/qtscript_core.pro
+++ b/qtbindings/qtscript_core/qtscript_core.pro
@@ -7,7 +7,3 @@ symbian {
     TARGET.EPOCALLOWDLLDATA=1
 }
 
-maemo5|maemo6 {
-    target.path = /usr/local/lib
-    INSTALLS += target
-}