Update "deployment" rules for "testapps" for easier running on Maemo

12 files changed, 85 insertions, 25 deletions

diff --git a/tests/qtuitest/testapps/fileDialogSaveApp/fileDialogSaveApp.pro b/tests/qtuitest/testapps/fileDialogSaveApp/fileDialogSaveApp.pro
index ca4194c..d5ae363 100644
--- a/tests/qtuitest/testapps/fileDialogSaveApp/fileDialogSaveApp.pro
+++ b/tests/qtuitest/testapps/fileDialogSaveApp/fileDialogSaveApp.pro
@@ -6,7 +6,10 @@ TEMPLATE = app
 TARGET = 
 DEPENDPATH += .
 INCLUDEPATH += .
-mac:DESTDIR=$$BUILDROOT/bin
+unix:!maemo* {
+    # avoid the need for make install on *nix
+    DESTDIR=$$BUILDROOT/bin
+}
 
 # Input
 SOURCES += main.cpp
@@ -16,4 +19,4 @@ target.path += \
     /usr/local/bin
 
 INSTALLS += \
-    target
\ No newline at end of file
+    target
diff --git a/tests/qtuitest/testapps/graphicsViewTest/graphicsViewTest.pro b/tests/qtuitest/testapps/graphicsViewTest/graphicsViewTest.pro
index d1cb25f..798a1ac 100644
--- a/tests/qtuitest/testapps/graphicsViewTest/graphicsViewTest.pro
+++ b/tests/qtuitest/testapps/graphicsViewTest/graphicsViewTest.pro
@@ -2,14 +2,16 @@ TEMPLATE = app
 TARGET = 
 DEPENDPATH += .
 INCLUDEPATH += .
+unix:!maemo* {
+    # avoid the need for make install on *nix
+    DESTDIR=$$BUILDROOT/bin
+}
 
 HEADERS += mainwindow.h
 SOURCES += main.cpp mainwindow.cpp
-mac:DESTDIR=$$BUILDROOT/bin
-
 
 target.path += \
     /usr/local/bin
 
 INSTALLS += \
-    target
\ No newline at end of file
+    target
diff --git a/tests/qtuitest/testapps/testapp1/testapp1.pro b/tests/qtuitest/testapps/testapp1/testapp1.pro
index 6d4d015..b6f8cf2 100644
--- a/tests/qtuitest/testapps/testapp1/testapp1.pro
+++ b/tests/qtuitest/testapps/testapp1/testapp1.pro
@@ -1,7 +1,9 @@
 SOURCES*=main.cpp
 TEMPLATE=app
-DEFINES*=TARGET=$$TARGET
-mac:DESTDIR=$$BUILDROOT/bin
+unix:!maemo* {
+    # avoid the need for make install on *nix
+    DESTDIR=$$BUILDROOT/bin
+}
 
 QT+=network
 
@@ -21,4 +23,7 @@ mac {
 
 
 target.path += \
-    /usr/local/bin
\ No newline at end of file
+    /usr/local/bin
+
+INSTALLS += \
+    target
diff --git a/tests/qtuitest/testapps/testapp2/testapp2.pro b/tests/qtuitest/testapps/testapp2/testapp2.pro
index ee17bd4..b63b114 100644
--- a/tests/qtuitest/testapps/testapp2/testapp2.pro
+++ b/tests/qtuitest/testapps/testapp2/testapp2.pro
@@ -1,6 +1,9 @@
 SOURCES*=main.cpp
 TEMPLATE=app
-mac:DESTDIR=$$BUILDROOT/bin
+unix:!maemo* {
+    # avoid the need for make install on *nix
+    DESTDIR=$$BUILDROOT/bin
+}
 
 symbian {
     TARGET.EPOCALLOWDLLDATA=1
@@ -18,4 +21,7 @@ mac {
 
 
 target.path += \
-    /usr/local/bin
\ No newline at end of file
+    /usr/local/bin
+
+INSTALLS += \
+    target
diff --git a/tests/qtuitest/testapps/testapp3/testapp3.pro b/tests/qtuitest/testapps/testapp3/testapp3.pro
index ee17bd4..b63b114 100644
--- a/tests/qtuitest/testapps/testapp3/testapp3.pro
+++ b/tests/qtuitest/testapps/testapp3/testapp3.pro
@@ -1,6 +1,9 @@
 SOURCES*=main.cpp
 TEMPLATE=app
-mac:DESTDIR=$$BUILDROOT/bin
+unix:!maemo* {
+    # avoid the need for make install on *nix
+    DESTDIR=$$BUILDROOT/bin
+}
 
 symbian {
     TARGET.EPOCALLOWDLLDATA=1
@@ -18,4 +21,7 @@ mac {
 
 
 target.path += \
-    /usr/local/bin
\ No newline at end of file
+    /usr/local/bin
+
+INSTALLS += \
+    target
diff --git a/tests/qtuitest/testapps/testapp4/testapp4.pro b/tests/qtuitest/testapps/testapp4/testapp4.pro
index ee17bd4..b63b114 100644
--- a/tests/qtuitest/testapps/testapp4/testapp4.pro
+++ b/tests/qtuitest/testapps/testapp4/testapp4.pro
@@ -1,6 +1,9 @@
 SOURCES*=main.cpp
 TEMPLATE=app
-mac:DESTDIR=$$BUILDROOT/bin
+unix:!maemo* {
+    # avoid the need for make install on *nix
+    DESTDIR=$$BUILDROOT/bin
+}
 
 symbian {
     TARGET.EPOCALLOWDLLDATA=1
@@ -18,4 +21,7 @@ mac {
 
 
 target.path += \
-    /usr/local/bin
\ No newline at end of file
+    /usr/local/bin
+
+INSTALLS += \
+    target
diff --git a/tests/qtuitest/tst_qalternatestack/tst_qalternatestack.pro b/tests/qtuitest/tst_qalternatestack/tst_qalternatestack.pro
index 07546a8..ebdfda7 100644
--- a/tests/qtuitest/tst_qalternatestack/tst_qalternatestack.pro
+++ b/tests/qtuitest/tst_qalternatestack/tst_qalternatestack.pro
@@ -2,16 +2,23 @@ TEMPLATE=app
 CONFIG+=unittest
 QT = core
 TARGET=tst_qalternatestack
+CONFIG += qtestlib
+INCLUDEPATH += $$SRCROOT/libqtuitest
 
 CONFIG-=debug_and_release_target
 
 SOURCES+=                   \
     tst_qalternatestack.cpp
 
-
+symbian {
+    LIBS+=-L$$OUT_PWD/ -lqtuitest
+}else{
+    LIBS += -L$$BUILDROOT/lib
+}
+LIBS += -lqtuitest
 
 target.path += \
     /usr/local/bin
 
 INSTALLS += \
-    target
\ No newline at end of file
+    target
diff --git a/tests/qtuitest/tst_qelapsedtimer/tst_qelapsedtimer.pro b/tests/qtuitest/tst_qelapsedtimer/tst_qelapsedtimer.pro
index da914e0..3b4ba78 100644
--- a/tests/qtuitest/tst_qelapsedtimer/tst_qelapsedtimer.pro
+++ b/tests/qtuitest/tst_qelapsedtimer/tst_qelapsedtimer.pro
@@ -1,6 +1,9 @@
 TEMPLATE=app
 CONFIG+=unittest
 QT = core
+CONFIG+=qtestlib
+INCLUDEPATH += $$SRCROOT/libqtuitest
+
 TARGET=tst_qelapsedtimer
 
 CONFIG-=debug_and_release_target
@@ -8,9 +11,15 @@ CONFIG-=debug_and_release_target
 SOURCES+=                   \
     tst_qelapsedtimer.cpp
 
+symbian {
+    LIBS+=-L$$OUT_PWD/ -lqtuitest
+}else{
+    LIBS += -L$$BUILDROOT/lib
+}
+LIBS += -lqtuitest
 
 target.path += \
     /usr/local/bin
 
 INSTALLS += \
-    target
\ No newline at end of file
+    target
diff --git a/tests/qtuitest/tst_qinputgenerator/tst_qinputgenerator.pro b/tests/qtuitest/tst_qinputgenerator/tst_qinputgenerator.pro
index 4398ab6..c1b023f 100644
--- a/tests/qtuitest/tst_qinputgenerator/tst_qinputgenerator.pro
+++ b/tests/qtuitest/tst_qinputgenerator/tst_qinputgenerator.pro
@@ -2,6 +2,8 @@ TEMPLATE=app
 CONFIG+=unittest
 QT = core gui
 TARGET=tst_qinputgenerator
+CONFIG+=qtestlib
+INCLUDEPATH += $$SRCROOT/libqtuitest
 
 CONFIG-=debug_and_release_target
 
@@ -15,10 +17,15 @@ else {
     SOURCES+=nativeevent_noop.cpp
 }
 
-
+symbian {
+    LIBS+=-L$$OUT_PWD/ -lqtuitest
+}else{
+    LIBS += -L$$BUILDROOT/lib
+}
+LIBS += -lqtuitest
 
 target.path += \
     /usr/local/bin
 
 INSTALLS += \
-    target
\ No newline at end of file
+    target
diff --git a/tests/qtuitest/tst_qtestprotocol/tst_qtestprotocol.pro b/tests/qtuitest/tst_qtestprotocol/tst_qtestprotocol.pro
index 54d1ce6..c36286b 100644
--- a/tests/qtuitest/tst_qtestprotocol/tst_qtestprotocol.pro
+++ b/tests/qtuitest/tst_qtestprotocol/tst_qtestprotocol.pro
@@ -2,6 +2,8 @@ TEMPLATE=app
 CONFIG+=unittest
 QT = core network
 TARGET=tst_qtestprotocol
+CONFIG+=qtestlib
+INCLUDEPATH += $$SRCROOT/libqtuitest
 
 CONFIG-=debug_and_release_target
 
@@ -16,11 +18,13 @@ HEADERS+=                   \
 
 symbian {
     LIBS+=-L$$OUT_PWD/ -lqtuitest
+}else{
+    LIBS += -L$$BUILDROOT/lib
 }
-
+LIBS += -lqtuitest
 
 target.path += \
     /usr/local/bin
 
 INSTALLS += \
-    target
\ No newline at end of file
+    target
diff --git a/tests/qtuitest/tst_qtuitestnamespace/tst_qtuitestnamespace.pro b/tests/qtuitest/tst_qtuitestnamespace/tst_qtuitestnamespace.pro
index b672977..004e5a9 100644
--- a/tests/qtuitest/tst_qtuitestnamespace/tst_qtuitestnamespace.pro
+++ b/tests/qtuitest/tst_qtuitestnamespace/tst_qtuitestnamespace.pro
@@ -2,15 +2,17 @@ TEMPLATE=app
 CONFIG+=unittest
 QT = core gui
 TARGET=tst_qtuitestnamespace
+CONFIG+=qtestlib
+INCLUDEPATH += $$SRCROOT/libqtuitest
+LIBS += -lqtuitest -L$$BUILDROOT/lib
 
 CONFIG-=debug_and_release_target
 
 SOURCES+=                   \
     tst_qtuitestnamespace.cpp
 
-
 target.path += \
     /usr/local/bin
 
 INSTALLS += \
-    target
\ No newline at end of file
+    target
diff --git a/tests/qtuitest/tst_qtuitestwidgets/tst_qtuitestwidgets.pro b/tests/qtuitest/tst_qtuitestwidgets/tst_qtuitestwidgets.pro
index 85a8eaa..5fe2009 100644
--- a/tests/qtuitest/tst_qtuitestwidgets/tst_qtuitestwidgets.pro
+++ b/tests/qtuitest/tst_qtuitestwidgets/tst_qtuitestwidgets.pro
@@ -1,6 +1,10 @@
 TEMPLATE=app
 CONFIG+=unittest
+CONFIG+=qtestlib
 QT = core gui
+INCLUDEPATH += $$SRCROOT/libqtuitest
+LIBS += -lqtuitest -L$$BUILDROOT/lib
+
 TARGET=tst_qtuitestwidgets
 
 CONFIG-=debug_and_release_target
@@ -18,9 +22,8 @@ win32 {
     LIBS+=$$OUT_PWD/../../lib/qtuitest.lib
 }
 
-
 target.path += \
     /usr/local/bin
 
 INSTALLS += \
-    target
\ No newline at end of file
+    target