Resolve bad changes in target.path's

13 files changed, 45 insertions, 42 deletions

diff --git a/libqtslave/libqtslave.pro b/libqtslave/libqtslave.pro
index da568cb..eba1752 100644
--- a/libqtslave/libqtslave.pro
+++ b/libqtslave/libqtslave.pro
@@ -49,6 +49,7 @@ SOURCES += \
         qtestslave.cpp \
         qtestwidgets.cpp
 
-
-target.path += \
-    /usr/local/lib
\ No newline at end of file
+maemo5|maemo6 {
+    target.path = /usr/local/lib
+    INSTALLS += target
+}
diff --git a/libqtuitest/libqtuitest.pro b/libqtuitest/libqtuitest.pro
index 1d203fa..8540bfb 100644
--- a/libqtuitest/libqtuitest.pro
+++ b/libqtuitest/libqtuitest.pro
@@ -83,6 +83,7 @@ TARGET=qtuitest
 TARGET=$$qtLibraryTarget($$TARGET)
 CONFIG-=debug_and_release_target
 
-
-target.path += \
-    /usr/local/lib
\ No newline at end of file
+maemo5|maemo6 {
+    target.path = /usr/local/lib
+    INSTALLS += target
+}
diff --git a/plugins/qtuitest_widgets/hbwidgets/hbwidgets.pro b/plugins/qtuitest_widgets/hbwidgets/hbwidgets.pro
index 7599675..cce04df 100644
--- a/plugins/qtuitest_widgets/hbwidgets/hbwidgets.pro
+++ b/plugins/qtuitest_widgets/hbwidgets/hbwidgets.pro
@@ -51,7 +51,7 @@ win32 {
     INSTALLS+=target
 }
 
-
-
-target.path += \
-    /usr/local/lib
\ No newline at end of file
+maemo5|maemo6 {
+    target.path = /usr/local/lib
+    INSTALLS += target
+}
diff --git a/plugins/qtuitest_widgets/qgraphicsviewwidgets/qgraphicsviewwidgets.pro b/plugins/qtuitest_widgets/qgraphicsviewwidgets/qgraphicsviewwidgets.pro
index 7fe9221..7291b58 100644
--- a/plugins/qtuitest_widgets/qgraphicsviewwidgets/qgraphicsviewwidgets.pro
+++ b/plugins/qtuitest_widgets/qgraphicsviewwidgets/qgraphicsviewwidgets.pro
@@ -42,5 +42,7 @@ win32 {
 }
 
 
-target.path += \
-    /usr/local/lib
\ No newline at end of file
+maemo5|maemo6 {
+    target.path = /usr/local/lib
+    INSTALLS += target
+}
diff --git a/plugins/qtuitest_widgets/qmlwidgets/qmlwidgets.pro b/plugins/qtuitest_widgets/qmlwidgets/qmlwidgets.pro
index f204724..1b2707f 100644
--- a/plugins/qtuitest_widgets/qmlwidgets/qmlwidgets.pro
+++ b/plugins/qtuitest_widgets/qmlwidgets/qmlwidgets.pro
@@ -48,6 +48,3 @@ contains(QT_CONFIG, webkit) {
     HEADERS+=testdeclarativewebview.h
 }
 
-
-target.path += \
-    /usr/local/lib
\ No newline at end of file
diff --git a/plugins/qtuitest_widgets/qtwidgets/qtwidgets.pro b/plugins/qtuitest_widgets/qtwidgets/qtwidgets.pro
index f91e33e..111d326 100644
--- a/plugins/qtuitest_widgets/qtwidgets/qtwidgets.pro
+++ b/plugins/qtuitest_widgets/qtwidgets/qtwidgets.pro
@@ -97,5 +97,7 @@ contains(QT_CONFIG, webkit) {
 }
 
 
-target.path += \
-    /usr/local/lib
\ No newline at end of file
+maemo5|maemo6 {
+    target.path = /usr/local/lib
+    INSTALLS += target
+}
diff --git a/plugins/styles/qtuitest/qtuitest.pro b/plugins/styles/qtuitest/qtuitest.pro
index 6a567f5..3d071aa 100644
--- a/plugins/styles/qtuitest/qtuitest.pro
+++ b/plugins/styles/qtuitest/qtuitest.pro
@@ -43,6 +43,7 @@ win32 {
     INSTALLS+=target
 }
 
-
-target.path += \
-    /usr/local/lib
\ No newline at end of file
+maemo5|maemo6 {
+    target.path = /usr/local/lib
+    INSTALLS += target
+}
diff --git a/qtbindings/qtscript_core/qtscript_core.pro b/qtbindings/qtscript_core/qtscript_core.pro
index c21feb5..e273685 100644
--- a/qtbindings/qtscript_core/qtscript_core.pro
+++ b/qtbindings/qtscript_core/qtscript_core.pro
@@ -7,10 +7,7 @@ symbian {
     TARGET.EPOCALLOWDLLDATA=1
 }
 
-
-
-target.path += \
-    /usr/local/lib
-
-INSTALLS += \
-    target
\ No newline at end of file
+maemo5|maemo6 {
+    target.path = /usr/local/lib
+    INSTALLS += target
+}
diff --git a/qtuitest-host.pri b/qtuitest-host.pri
index 246e162..0ca49a5 100644
--- a/qtuitest-host.pri
+++ b/qtuitest-host.pri
@@ -52,13 +52,13 @@ HEADERS +=\
 
 SOURCES +=\
  #       $$QTUITEST_SRC/libqsystemtest/gracefulquit.cpp \
+        $$QTUITEST_SRC/libqsystemtest/qtestide.cpp \
         $$QTUITEST_SRC/libqsystemtest/qabstracttest.cpp \
         $$QTUITEST_SRC/libqsystemtest/qtestremote.cpp \
         $$QTUITEST_SRC/libqsystemtest/qtestverifydlg.cpp \
         $$QTUITEST_SRC/libqsystemtest/qsystemtest.cpp \
         $$QTUITEST_SRC/libqsystemtest/qsystemtest_p.cpp \
         $$QTUITEST_SRC/libqsystemtest/qsystemtestmaster.cpp \
-        $$QTUITEST_SRC/libqsystemtest/qtestide.cpp \
         $$QTUITEST_SRC/libqsystemtest/testcontrol.cpp \
         $$QTUITEST_SRC/libqsystemtest/maemotestcontrol.cpp \
         $$QTUITEST_SRC/libqsystemtest/symbiantestcontrol.cpp \
diff --git a/tests/qtuitest/testapps/testapp1/testapp1.pro b/tests/qtuitest/testapps/testapp1/testapp1.pro
index 4cfe3d9..eedc1f0 100644
--- a/tests/qtuitest/testapps/testapp1/testapp1.pro
+++ b/tests/qtuitest/testapps/testapp1/testapp1.pro
@@ -21,7 +21,7 @@ mac {
     CONFIG-=app_bundle
 }
 
-
-
-target.path += \
-    /usr/local/bin
\ No newline at end of file
+maemo5|maemo6 {
+    target.path = /usr/local/lib
+    INSTALLS += target
+}
diff --git a/tests/qtuitest/testapps/testapp2/testapp2.pro b/tests/qtuitest/testapps/testapp2/testapp2.pro
index f9ba88b..07ae95a 100644
--- a/tests/qtuitest/testapps/testapp2/testapp2.pro
+++ b/tests/qtuitest/testapps/testapp2/testapp2.pro
@@ -19,6 +19,7 @@ mac {
     CONFIG-=app_bundle
 }
 
-
-target.path += \
-    /usr/local/bin
\ No newline at end of file
+maemo5|maemo6 {
+    target.path = /usr/local/lib
+    INSTALLS += target
+}
diff --git a/tests/qtuitest/testapps/testapp3/testapp3.pro b/tests/qtuitest/testapps/testapp3/testapp3.pro
index 46cedd2..07ae95a 100644
--- a/tests/qtuitest/testapps/testapp3/testapp3.pro
+++ b/tests/qtuitest/testapps/testapp3/testapp3.pro
@@ -19,7 +19,7 @@ mac {
     CONFIG-=app_bundle
 }
 
-
-
-target.path += \
-    /usr/local/bin
\ No newline at end of file
+maemo5|maemo6 {
+    target.path = /usr/local/lib
+    INSTALLS += target
+}
diff --git a/tests/qtuitest/testapps/testapp4/testapp4.pro b/tests/qtuitest/testapps/testapp4/testapp4.pro
index f9ba88b..07ae95a 100644
--- a/tests/qtuitest/testapps/testapp4/testapp4.pro
+++ b/tests/qtuitest/testapps/testapp4/testapp4.pro
@@ -19,6 +19,7 @@ mac {
     CONFIG-=app_bundle
 }
 
-
-target.path += \
-    /usr/local/bin
\ No newline at end of file
+maemo5|maemo6 {
+    target.path = /usr/local/lib
+    INSTALLS += target
+}