Add new QTestIDE class to enable easier integration with creator.

Fix some build problems and "make test" problems on Linux.
Remove examples directory, no longer required.

42 files changed, 398 insertions, 423 deletions

diff --git a/botan/src/src.pro b/botan/src/src.pro
index 14a92ff..06524ff 100644
--- a/botan/src/src.pro
+++ b/botan/src/src.pro
@@ -1,6 +1,8 @@
 TEMPLATE = lib
 TARGET = Botan
 DESTDIR = $$BUILDROOT/lib
+target.path=$$[QT_INSTALL_LIBS]
+INSTALLS+=target
 
 CONFIG += dll
 
diff --git a/examples/cppsystemtest/README b/examples/cppsystemtest/README
deleted file mode 100644
index 5fbd79f..0000000
--- a/examples/cppsystemtest/README
+++ /dev/null
@@ -1,8 +0,0 @@
-This example shows how an external test framework can communicate directly
-with QtUiTest at the C++ level (not via QtScript).
-
-Notes:
-- Certain QtUiTest functionality that is implemented using QtScript will not
-  be available.
-- Ensure the directory containing libqsystemtest.so* is in LD_LIBRARY_PATH
-- The example relies on testapp1 being in the path.
diff --git a/examples/cppsystemtest/cppsystemtest.pro b/examples/cppsystemtest/cppsystemtest.pro
deleted file mode 100644
index c04397f..0000000
--- a/examples/cppsystemtest/cppsystemtest.pro
+++ /dev/null
@@ -1,34 +0,0 @@
-SOURCES += main.cpp
-TEMPLATE=app
-MOC_DIR=$$OUT_PWD/.moc
-OBJECTS_DIR=$$OUT_PWD/.obj
-VPATH+=$$PWD
-INCLUDEPATH+=$$PWD
-INCLUDEPATH+=$$SRCROOT/libqsystemtest
-INCLUDEPATH+=$$SRCROOT/libqtuitest
-INCLUDEPATH+=$$SRCROOT
-
-TARGET=mysystemtest
-
-win32 {
-    CONFIG(debug,debug|release):  LIBS+=-L$$BUILDROOT/libqsystemtest/debug -lqsystemtestd -L$$BUILDROOT/libqtuitest -lqtuitestd
-    CONFIG(release,debug|release):LIBS+=-L$$BUILDROOT/libqsystemtest/release -lqsystemtest -L$$BUILDROOT/libqtuitest -lqtuitest
-}
-
-!win32:!symbian:!mac {
-   LIBS += -L$$BUILDROOT/lib -lqsystemtest -lqtuitest
-}
-
-mac {
-    CONFIG(debug,debug|release): LIBS += -L$$BUILDROOT/lib -lqsystemtest_debug -lqtuitest_debug
-    CONFIG(release,debug|release): LIBS += -L$$BUILDROOT/lib -lqsystemtest -lqtuitest
-}
-
-CONFIG+=qtestlib debug
-
-
-target.path += \
-    /usr/local/bin
-
-INSTALLS += \
-    target
diff --git a/examples/cppsystemtest/main.cpp b/examples/cppsystemtest/main.cpp
deleted file mode 100644
index 360bdb5..0000000
--- a/examples/cppsystemtest/main.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <QApplication>
-#include <QDebug>
-#include <qsystemtest.h>
-
-class MySystemTest : public QSystemTest
-{
-protected:
-    virtual bool fail(const QString& msg)
-    {
-        qDebug() << msg;
-        return false;
-    }
-};
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv, true);
-    MySystemTest tc;
-
-    tc.startApplication("testapp1");
-    tc.enter("Hello world", "LineEdit1");
-    tc.enter("Goodbye, cruel world", "LineEdit2");
-    tc.prompt("That's all, folks");
-    return 0;
-}
diff --git a/examples/examples.pro b/examples/examples.pro
deleted file mode 100644
index af2d220..0000000
--- a/examples/examples.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-TEMPLATE=subdirs
-SUBDIRS+=cppsystemtest
diff --git a/features/systemtest.prf b/features/systemtest.prf
index 9cfda0e..72bc6e4 100644
--- a/features/systemtest.prf
+++ b/features/systemtest.prf
@@ -10,20 +10,21 @@ unix:!mac:!symbian {
         fi
     QMAKE_EXTRA_TARGETS+=symlink
 
-    testapp_symlink.commands =                                   \
-        for app in $$TESTAPPS; do                                \
-            APPPATH=$$BUILDROOT/tests/qtuitest/testapps/\$\$app; \
-            [ -d \$\$APPPATH ] || continue;                      \
-            ln -sf \$\$APPPATH/\$\$app $$BUILDDIR/\$\$app;       \
-        done
-    QMAKE_EXTRA_TARGETS+=testapp_symlink
-
-    test.commands = PATH=$$BUILDDIR:\$\$PATH QTUITEST_INCLUDE_PATH=$$SRCROOT/tests/shared:\$\$QTUITEST_INCLUDE_PATH $$[QT_INSTALL_BINS]/qtuitestrunner $$BUILDDIR/$$SOURCES $(ARGS)
-    test.depends = symlink testapp_symlink
+#    testapp_symlink.commands =                                   \
+#        for app in $$TESTAPPS; do                                \
+#            APPPATH=$$BUILDROOT/tests/qtuitest/testapps/\$\$app; \
+#            [ -d \$\$APPPATH ] || continue;                      \
+#            ln -sf \$\$APPPATH/\$\$app $$BUILDDIR/\$\$app;       \
+#        done
+#    QMAKE_EXTRA_TARGETS+=testapp_symlink
+
+    test.commands = PATH=$$BUILDDIR:$$BUILDROOT/bin:\$\$PATH QTUITEST_INCLUDE_PATH=$$SRCROOT/tests/shared:\$\$QTUITEST_INCLUDE_PATH $$[QT_INSTALL_BINS]/qtuitestrunner $$BUILDDIR/$$SOURCES $(ARGS)
+#    test.depends = symlink testapp_symlink
+    test.depends = symlink
     QMAKE_EXTRA_TARGETS+=test
 
-    storetest.commands = PATH=$$[QT_INSTALL_BINS]:$$BUILDDIR:\$\$PATH BUILDDIR=$$BUILDDIR perl $$SRCROOT/scripts/storetest.pl $$BUILDDIR/$$SOURCES $(ARGS)
-    storetest.depends = symlink testapp_symlink
+    storetest.commands = PATH=$$[QT_INSTALL_BINS]:$$BUILDDIR/bin:\$\$PATH BUILDDIR=$$BUILDDIR perl $$SRCROOT/scripts/storetest.pl $$BUILDDIR/$$SOURCES $(ARGS)
+    storetest.depends = symlink
     QMAKE_EXTRA_TARGETS+=storetest
 }
 
diff --git a/interpreter/interpreter.pro b/interpreter/interpreter.pro
index 4954f5f..8e2a941 100644
--- a/interpreter/interpreter.pro
+++ b/interpreter/interpreter.pro
@@ -22,6 +22,7 @@ INCLUDEPATH+=$$SRCROOT/libqsystemtest
 QT+=script network
 CONFIG+=qtestlib
 TARGET=qtuitestrunner
+LIBS+=-L$$BUILDROOT/lib -lBotan
 
 !symbian {
     MOC_DIR=$$OUT_PWD/.moc
@@ -59,6 +60,3 @@ mac {
     CONFIG(release,debug|release): LIBS += -L$$BUILDROOT/lib -lqsystemtest -lqtuitest
 }
 
-
-target.path += \
-    /usr/local/bin
\ No newline at end of file
diff --git a/interpreter/qscriptsystemtest.cpp b/interpreter/qscriptsystemtest.cpp
index 0a041d6..ad7f32b 100644
--- a/interpreter/qscriptsystemtest.cpp
+++ b/interpreter/qscriptsystemtest.cpp
@@ -47,7 +47,8 @@
 #include <QScriptValueIterator>
 #include <QScriptContextInfo>
 
-#include <qtestprotocol_p.h>
+//#include <qtestprotocol_p.h>
+#include <qtestide.h>
 #include <QtTest/QtTest>
 
 #include "qtscript_bindings.h"
@@ -882,40 +883,17 @@ void QScriptSystemTest::scriptPositionChange(qint64 scriptId, int line, int colu
     Q_UNUSED(scriptId);
     Q_UNUSED(line);
     Q_UNUSED(column);
-    
+
     QScriptContextInfo ctxInfo(m_engine.currentContext());
     if (!ctxInfo.fileName().isEmpty() && !builtins.contains(ctxInfo.fileName())) {
-        if (testIDE()->isConnected()) {
-            QTestMessage ide_msg("queryBreakpoint");
-            ide_msg["file"] = ctxInfo.fileName();
-            ide_msg["line"] = ctxInfo.lineNumber();
-            if (ctxInfo.functionName().isEmpty()) {
-                ide_msg["function"] = currentTestFunction();
-            } else {
-                ide_msg["function"] = ctxInfo.functionName();
-                ide_msg["funcStart"] = ctxInfo.functionStartLineNumber();
-                ide_msg["funcEnd"] = ctxInfo.functionEndLineNumber();
-            }
-            ide_msg["depth"] = m_contextDepth;
-            QTestMessage reply;
-            testIDE()->sendMessage( ide_msg, reply, -1 );
-            if (reply["status"] == "sendContext") {
-                // Breakpoint reached, need to send context to IDE
-                QTestMessage ide_msg("context");
-                int i=0;
-                for (QScriptContext *c = m_engine.currentContext();
-                        c && c->parentContext();
-                        c = c->parentContext(), ++i) {
-                    QVariantMap contextMap;
-                    contextToMap(c, contextMap);
-                    ide_msg[QString("context_%1").arg(i)] = contextMap;
-                }
-                ide_msg["context_count"] = i;
-                QTestMessage reply;
-                testIDE()->sendMessage( ide_msg, reply, -1 );
-            }
+        QString functionName;
+        if (ctxInfo.functionName().isEmpty()) {
+            functionName = currentTestFunction();
         } else {
-            qDebug() << "Test IDE is NOT connected";
+            functionName = ctxInfo.functionName();
+        }
+        if (testIDE()->queryBreakpoint(ctxInfo.fileName(), ctxInfo.lineNumber(), functionName, m_contextDepth)) {
+            testIDE()->breakpointContext(m_engine.currentContext());
         }
     }
 }
@@ -927,32 +905,3 @@ void QScriptSystemTest::scriptContextChange(bool isNew)
     else
         --m_contextDepth;
 };
-
-void QScriptSystemTest::contextToMap(const QScriptContext* scriptContext, QVariantMap &contextMap)
-{
-    QVariantMap vars;
-    QScriptContextInfo ctxInfo(scriptContext);
-    
-    QScriptValue locals = scriptContext->activationObject();
-    if (!locals.isValid()) return;
-    QScriptValueIterator it(locals);
-    while (it.hasNext()) {
-        it.next();
-        if (!it.value().toVariant().isValid()) {
-          continue;
-        }
-        vars[it.name()] = it.value().toVariant();
-    }
-
-    contextMap["vars"] = vars;
-    contextMap["file"] = ctxInfo.fileName();                
-    contextMap["line"] = ctxInfo.lineNumber();
-
-    if (ctxInfo.functionName().isEmpty()) {
-        contextMap["function"] = currentTestFunction();
-    } else {
-        contextMap["function"] = ctxInfo.functionName();
-        contextMap["funcStart"] = ctxInfo.functionStartLineNumber();
-        contextMap["funcEnd"] = ctxInfo.functionEndLineNumber();
-    }
-}
diff --git a/interpreter/qscriptsystemtest.h b/interpreter/qscriptsystemtest.h
index 7244db3..61d8429 100644
--- a/interpreter/qscriptsystemtest.h
+++ b/interpreter/qscriptsystemtest.h
@@ -101,10 +101,7 @@ protected:
 
     virtual void processMessage(const QTestMessage& message);
 
-
-private:
-    void contextToMap(const QScriptContext* scriptContext, QVariantMap&);
-    
+private:   
     QString filename;
     QScriptEngine m_engine;
     QScriptEngineAgent *m_agent;
diff --git a/libqsystemtest/libqsystemtest.pro b/libqsystemtest/libqsystemtest.pro
index ff559de..f12c431 100644
--- a/libqsystemtest/libqsystemtest.pro
+++ b/libqsystemtest/libqsystemtest.pro
@@ -14,67 +14,69 @@ HEADERS +=\
         gracefulquit.h \
         qabstracttest.h \
         qsystemtest.h \
-	testdevicecontrol.h
+        qtestide.h \
+        testdevicecontrol.h
 
 SOURCES +=\
         gracefulquit.cpp \
         qabstracttest.cpp \
+        qtestide.cpp \
         qtestremote.cpp \
         qtestverifydlg.cpp \
         qsystemtest.cpp \
         qsystemtest_p.cpp \
         qsystemtestmaster.cpp \
-	testdevicecontrol.cpp
+        testdevicecontrol.cpp
 
 HEADERS +=\
-	../coreplugin/ssh/sftpchannel.h \
-	../coreplugin/ssh/sftpchannel_p.h \
-	../coreplugin/ssh/sftpdefs.h \
-	../coreplugin/ssh/sftpincomingpacket_p.h \
-	../coreplugin/ssh/sftpoperation_p.h \
-	../coreplugin/ssh/sftpoutgoingpacket_p.h \
-	../coreplugin/ssh/sftppacket_p.h \
-	../coreplugin/ssh/sshbotanconversions_p.h \
-	../coreplugin/ssh/sshcapabilities_p.h \
-	../coreplugin/ssh/sshchannel_p.h \
-	../coreplugin/ssh/sshchannelmanager_p.h \
-	../coreplugin/ssh/sshconnection.h \
-	../coreplugin/ssh/sshconnection_p.h \
-	../coreplugin/ssh/sshcryptofacility_p.h \
-	../coreplugin/ssh/sshdelayedsignal_p.h \
-	../coreplugin/ssh/ssherrors.h \
-	../coreplugin/ssh/sshexception_p.h \
-	../coreplugin/ssh/sshincomingpacket_p.h \
-	../coreplugin/ssh/sshkeyexchange_p.h \
-	../coreplugin/ssh/sshkeygenerator.h \
-	../coreplugin/ssh/sshoutgoingpacket_p.h \
-	../coreplugin/ssh/sshpacket_p.h \
-	../coreplugin/ssh/sshpacketparser_p.h \
-	../coreplugin/ssh/sshremoteprocess.h \
-	../coreplugin/ssh/sshremoteprocess_p.h \
-	../coreplugin/ssh/sshsendfacility_p.h
+        ../coreplugin/ssh/sftpchannel.h \
+        ../coreplugin/ssh/sftpchannel_p.h \
+        ../coreplugin/ssh/sftpdefs.h \
+        ../coreplugin/ssh/sftpincomingpacket_p.h \
+        ../coreplugin/ssh/sftpoperation_p.h \
+        ../coreplugin/ssh/sftpoutgoingpacket_p.h \
+        ../coreplugin/ssh/sftppacket_p.h \
+        ../coreplugin/ssh/sshbotanconversions_p.h \
+        ../coreplugin/ssh/sshcapabilities_p.h \
+        ../coreplugin/ssh/sshchannel_p.h \
+        ../coreplugin/ssh/sshchannelmanager_p.h \
+        ../coreplugin/ssh/sshconnection.h \
+        ../coreplugin/ssh/sshconnection_p.h \
+        ../coreplugin/ssh/sshcryptofacility_p.h \
+        ../coreplugin/ssh/sshdelayedsignal_p.h \
+        ../coreplugin/ssh/ssherrors.h \
+        ../coreplugin/ssh/sshexception_p.h \
+        ../coreplugin/ssh/sshincomingpacket_p.h \
+        ../coreplugin/ssh/sshkeyexchange_p.h \
+        ../coreplugin/ssh/sshkeygenerator.h \
+        ../coreplugin/ssh/sshoutgoingpacket_p.h \
+        ../coreplugin/ssh/sshpacket_p.h \
+        ../coreplugin/ssh/sshpacketparser_p.h \
+        ../coreplugin/ssh/sshremoteprocess.h \
+        ../coreplugin/ssh/sshremoteprocess_p.h \
+        ../coreplugin/ssh/sshsendfacility_p.h
 
 SOURCES +=\
-	../coreplugin/ssh/sftpchannel.cpp \
-	../coreplugin/ssh/sftpdefs.cpp \
-	../coreplugin/ssh/sftpincomingpacket.cpp \
-	../coreplugin/ssh/sftpoperation.cpp \
-	../coreplugin/ssh/sftpoutgoingpacket.cpp \
-	../coreplugin/ssh/sftppacket.cpp \
-	../coreplugin/ssh/sshcapabilities.cpp \
-	../coreplugin/ssh/sshchannel.cpp \
-	../coreplugin/ssh/sshchannelmanager.cpp \
-	../coreplugin/ssh/sshconnection.cpp \
-	../coreplugin/ssh/sshcryptofacility.cpp \
-	../coreplugin/ssh/sshdelayedsignal.cpp \
-	../coreplugin/ssh/sshincomingpacket.cpp \
-	../coreplugin/ssh/sshkeyexchange.cpp \
-	../coreplugin/ssh/sshkeygenerator.cpp \
-	../coreplugin/ssh/sshoutgoingpacket.cpp \
-	../coreplugin/ssh/sshpacket.cpp \
-	../coreplugin/ssh/sshpacketparser.cpp \
-	../coreplugin/ssh/sshremoteprocess.cpp \
-	../coreplugin/ssh/sshsendfacility.cpp
+        ../coreplugin/ssh/sftpchannel.cpp \
+        ../coreplugin/ssh/sftpdefs.cpp \
+        ../coreplugin/ssh/sftpincomingpacket.cpp \
+        ../coreplugin/ssh/sftpoperation.cpp \
+        ../coreplugin/ssh/sftpoutgoingpacket.cpp \
+        ../coreplugin/ssh/sftppacket.cpp \
+        ../coreplugin/ssh/sshcapabilities.cpp \
+        ../coreplugin/ssh/sshchannel.cpp \
+        ../coreplugin/ssh/sshchannelmanager.cpp \
+        ../coreplugin/ssh/sshconnection.cpp \
+        ../coreplugin/ssh/sshcryptofacility.cpp \
+        ../coreplugin/ssh/sshdelayedsignal.cpp \
+        ../coreplugin/ssh/sshincomingpacket.cpp \
+        ../coreplugin/ssh/sshkeyexchange.cpp \
+        ../coreplugin/ssh/sshkeygenerator.cpp \
+        ../coreplugin/ssh/sshoutgoingpacket.cpp \
+        ../coreplugin/ssh/sshpacket.cpp \
+        ../coreplugin/ssh/sshpacketparser.cpp \
+        ../coreplugin/ssh/sshremoteprocess.cpp \
+        ../coreplugin/ssh/sshsendfacility.cpp
 
 
 
@@ -91,11 +93,10 @@ TARGET=$$qtLibraryTarget($$TARGET)
 HEADERS*=$$SEMI_PRIVATE_HEADERS $$PRIVATE_HEADERS
 INCLUDEPATH+=$$SRCROOT/libqtuitest
 CONFIG+=qtestlib
-QT+=network
-LIBS+= -lBotan
+QT+=network script
+LIBS+=-L$$BUILDROOT/lib -lBotan
 
 unix:!symbian {
-    LIBS += -L$$BUILDROOT/lib
     DESTDIR=$$BUILDROOT/lib
     target.path=$$[QT_INSTALL_LIBS]
     INSTALLS+=target
@@ -127,6 +128,3 @@ mac {
     DEFINES+=sighandler_t=sig_t
 }
 
-
-target.path += \
-    /usr/local/lib
diff --git a/libqsystemtest/qsystemtest.cpp b/libqsystemtest/qsystemtest.cpp
index e50743d..e8dae1b 100644
--- a/libqsystemtest/qsystemtest.cpp
+++ b/libqsystemtest/qsystemtest.cpp
@@ -249,9 +249,10 @@ QSystemTest::QSystemTest()
     , m_mousePreferred(false)
     , screenGeometry()
     , theme()
-    , m_config_id()
+    , m_config_id()    
     , m_recording_events(false)
     , m_expect_app_close(false)
+    , m_qtest_ide(new QTestIDE(this))    
 {
     m_env.clear();
     ssh_param.host = "127.0.0.1";
@@ -307,6 +308,7 @@ QSystemTest::~QSystemTest()
     delete device_control;
     delete event_timer;
     delete m_test_app;
+    delete m_qtest_ide;
     while (expected_msg_boxes.count() > 0)
         delete expected_msg_boxes.takeFirst();
 }
@@ -944,11 +946,7 @@ void QSystemTest::verifyImage( const QString &expectedName, const QString &query
             if ( !actualIm.save(expectedFilename, "PNG", 0) ) {
                 QWARN(QString("Failed to save image to %1!").arg(expectedFilename).toLatin1());
             } else {
-                if (m_qtest_ide.isConnected()) {
-                    QTestMessage msg("NEW_TESTDATA");
-                    msg["filename"] = expectedFilename;
-                    m_qtest_ide.postMessage(msg);
-                }
+                testIDE()->newTestData(expectedFilename);
             }
             snapshotOk = true;
         } else {
@@ -2819,8 +2817,8 @@ void QSystemTest::processCommandLine( int &argc, char *argv[] )
             ++offset;
             ++i;
 
-            m_qtest_ide.openRemote( host, port );
-            connect(&m_qtest_ide, SIGNAL(abort()), this, SLOT(abortTest()));
+            testIDE()->openRemote( host, port );
+            connect(testIDE(), SIGNAL(abort()), this, SLOT(abortTest()));
 
         } else if ( !strcasecmp(argv[i], "-autip") || !strcasecmp(argv[i], "-authost") ) {
             char *given_arg = argv[i]; // so we can output 'autip' or 'authost' in error messages
@@ -2997,20 +2995,15 @@ bool QSystemTest::recordEvents( const QString &manualSteps, bool gui )
     m_recorded_code = QString();
     if (!queryPassed( "OK", "", QTestMessage("startEventRecording"))) return false;
     if (gui) {
-        if (m_qtest_ide.isConnected()) {
-            QTestMessage message("EVENT_RECORDING_STARTED");
-            message["file"] = currentFile();
-            message["line"] = currentLine();
-            message["steps"] = manualSteps;
-            m_qtest_ide.postMessage( message );
-            m_qtest_ide.must_stop_event_recording = false;
-            m_qtest_ide.event_recording_aborted = false;
+        if (testIDE()->isConnected()) {
+            testIDE()->eventRecordingStarted(currentFile(), currentLine(), manualSteps);
             m_recording_events = true;
-            while (!m_qtest_ide.must_stop_event_recording) {
+            while (!testIDE()->mustStopEventRecording()) {            
                 QTest::qWait( 50 );
             }
+            
             m_recording_events = false;
-            if (m_qtest_ide.event_recording_aborted) {
+            if (testIDE()->eventRecordingAborted()) {            
                 skip("Event recording aborted.", SkipSingle );
             }
         } else {
@@ -3239,12 +3232,7 @@ bool QSystemTest::fail(QString const &message)
             // If we saved it, let the IDE know.
             QFileInfo info(currentDataPath() + "/failure_" + config + ".png");
             if (info.exists()) {
-                QTestMessage msg("failure_screenshot");
-                msg["screenshot"]   = info.canonicalFilePath();
-                msg["filename"]     = currentFile();
-                msg["line"]         = currentLine();
-                msg["testfunction"] = QTest::currentTestFunction();
-                m_qtest_ide.postMessage(msg);
+                testIDE()->failureScreenshot(info.canonicalFilePath(), currentFile(), currentLine(), QTest::currentTestFunction());
             }
         }
 
@@ -3789,9 +3777,9 @@ bool QSystemTest::runAsManualTest(void)
     return m_run_as_manual_test;
 }
 
-QTestRemote *QSystemTest::testIDE()
+QTestIDE *QSystemTest::testIDE()
 {
-    return &m_qtest_ide;
+    return m_qtest_ide;
 }
 
 /*! 
diff --git a/libqsystemtest/qsystemtest.h b/libqsystemtest/qsystemtest.h
index e3125b2..7201249 100644
--- a/libqsystemtest/qsystemtest.h
+++ b/libqsystemtest/qsystemtest.h
@@ -44,7 +44,7 @@
 
 #include "qabstracttest.h"
 #include "qtestprotocol_p.h"
-#include "qtestremote_p.h"
+#include "qtestide.h"
 #include "recordevent_p.h"
 #include <testdevicecontrol.h>
 
@@ -451,7 +451,6 @@ protected:
     virtual void setLocation(const QString& = QString(),int = -1);
 
     virtual void processMessage(const QTestMessage&);
-//    QTestRemote *testIDE();
     
     bool abort_prompt;
 
@@ -472,7 +471,7 @@ public:
     QString PATH();
     QString which( const QString &appName );
 
-    QTestRemote *testIDE();
+    QTestIDE *testIDE();
 
 signals:
     void appGainedFocus(QString const &appName);
@@ -545,7 +544,6 @@ private:
     bool m_verbose_perf;
     bool m_verbose;
     QString m_targetID;
-    QTestRemote m_qtest_ide;
     QMap<QString, QString> appNameToBinary;
     bool m_strict_mode;
     int m_visible_response_time;
@@ -561,7 +559,7 @@ private:
     bool m_expect_app_close;
     int m_query_count;
     bool m_skip_current_function;
-
+    QTestIDE *m_qtest_ide;
 
 #ifdef Q_QDOC
 /* Functions where implementation is in QtScript */
diff --git a/libqsystemtest/qsystemtest_p.cpp b/libqsystemtest/qsystemtest_p.cpp
index 1914e62..200bdbe 100644
--- a/libqsystemtest/qsystemtest_p.cpp
+++ b/libqsystemtest/qsystemtest_p.cpp
@@ -77,18 +77,10 @@
 */
 bool QSystemTest::learnImage(const QImage &actual, const QImage &expected, const QString &comment)
 {
-    if (m_qtest_ide.isConnected()) {
-        QTestMessage returnValue;
-        QTestMessage msg("VERIFY_IMAGE");
-        msg["actual"] = actual.isNull() ? QPixmap() : QPixmap::fromImage(actual);
-        msg["expected"] = expected.isNull() ? QPixmap() : QPixmap::fromImage(expected);
-        msg["comment"] = comment;
-
-        if (m_qtest_ide.sendMessage( msg, returnValue, -1 ) && returnValue["status"] == "OK") {
-            return returnValue["accepted"].toBool();
-        } else {
-            return fail( "Verification of pixmap not possible: remote test tool did not correctly respond." );
-        }
+    if (m_qtest_ide->isConnected()) {
+        return m_qtest_ide->verifyImage(actual.isNull() ? QPixmap() : QPixmap::fromImage(actual),
+                                       expected.isNull() ? QPixmap() : QPixmap::fromImage(expected),
+                                       comment);
     } else {
         QTestVerifyDlg dlg;
         dlg.setWindowFlags(dlg.windowFlags() | Qt::WindowStaysOnTopHint);
@@ -247,11 +239,11 @@ void QSystemTest::manualTestData( const QString &description, bool isAlternative
 QTestMessage QSystemTest::query( const QTestMessage &msg, const QString &queryPath, int timeout )
 {
 //        manualTest( msg.event() + QString("--") + msg.msgId() + "--" + msg.toString() );
-    if (m_run_as_manual_test) {\
-        manualTest( QString("%1 -- %2 -- $3").arg(msg.event()).arg(msg.msgId()).arg(msg.toString()) );\
-        QTestMessage reply;\
-        reply["status"] = "OK";\
-        return reply;\
+    if (m_run_as_manual_test) {
+        manualTest( QString("%1 -- %2 -- $3").arg(msg.event()).arg(msg.msgId()).arg(msg.toString()) );
+        QTestMessage reply;
+        reply["status"] = "OK";
+        return reply;
     } else {
         if (!m_manual_commands.isEmpty())
             showPromptDialog();
@@ -276,24 +268,6 @@ QTestMessage QSystemTest::query( const QTestMessage &msg, const QString &queryPa
     m_last_msg_sent = message;
 
     if (m_test_app) {
-
-        static int breakpoint_mode = -1;
-        if (m_qtest_ide.isConnected()) {
-            if (breakpoint_mode == -1) {
-                QTestMessage reply;
-                QTestMessage ide_msg("queryBreakpointMode");
-                m_qtest_ide.sendMessage( ide_msg, reply, -1 );
-                breakpoint_mode = reply["queryBreakpointMode"].toBool();
-            }
-            if (breakpoint_mode == 1) {
-                QTestMessage ide_msg("queryBreakpoint");
-                ide_msg["file"] = currentFile();
-                ide_msg["line"] = QString("%1").arg(currentLine());
-                QTestMessage reply;
-                m_qtest_ide.sendMessage( ide_msg, reply, -1 );
-            }
-        }
-
         if (!m_test_app->sendMessage( message, reply, timeout )) {
             setQueryError(reply);
             return reply;
@@ -623,19 +597,7 @@ QString escapeString(QString const& in)
 QString widgetParameter(QString const& widget)
 {
     QString ret;
-/*
-    if (widget == SOFT_MENU_ALIAS)
-        ret = "softMenu()";
-    else if (widget == TAB_BAR_ALIAS)
-        ret = "tabBar()";
-    else if (widget == LAUNCHER_MENU_ALIAS)
-        ret = "launcherMenu()";
-    else if (widget == OPTIONS_MENU_ALIAS)
-        ret = "optionsMenu()";
-    else {
-*/
     ret = '"' + escapeString(widget) + '"';
-//    }
     return ret;
 }
 
@@ -733,11 +695,7 @@ void QSystemTest::recordEvents(QList<RecordEvent> const& events)
             m_recorded_events_edit->moveCursor(QTextCursor::End);
             m_recorded_events_edit->ensureCursorVisible();
         }
-        if (m_qtest_ide.isConnected()) {
-            QTestMessage ide_msg("recordedCode");
-            ide_msg["code"] = m_recorded_code;
-            m_qtest_ide.postMessage( ide_msg );
-        }
+        m_qtest_ide->recordedCode(m_recorded_code);
     }
 }
 /*
diff --git a/libqsystemtest/qtestide.cpp b/libqsystemtest/qtestide.cpp
new file mode 100644
index 0000000..2e9decd
--- /dev/null
+++ b/libqsystemtest/qtestide.cpp
@@ -0,0 +1,201 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of QtUiTest.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qtestide.h"
+#include "qsystemtest.h"
+#include <QScriptContext>
+#include <QScriptContextInfo>
+#include <QScriptValueIterator>
+#include <QPixmap>
+
+QTestIDE::QTestIDE(QSystemTest *sysTest)
+{
+    m_sysTest = sysTest;
+    must_stop_event_recording = false;
+    event_recording_aborted = false;
+}
+
+QTestIDE::~QTestIDE()
+{
+}
+
+/*!
+    \internal
+    Opens a socket connection to a remote test tool and uses the connection to
+    communicate with the connected tool.
+*/
+void QTestIDE::openRemote( const QString &ip, int port )
+{
+    m_remote.openRemote(ip, port);
+}
+
+bool QTestIDE::isConnected()
+{
+    return m_remote.isConnected();
+}
+
+bool QTestIDE::queryBreakpoint(const QString& file, int line, const QString& function, int depth)
+{
+    if (m_remote.isConnected()) {
+      QTestMessage ide_msg("queryBreakpoint");
+      ide_msg["file"] = file;
+      ide_msg["line"] = line;
+      ide_msg["function"] = function;
+      ide_msg["depth"] = depth;
+      QTestMessage reply;
+      m_remote.sendMessage( ide_msg, reply, -1 );
+      return (reply["status"] == "sendContext");
+    }
+    return false;
+}
+
+void QTestIDE::breakpointContext(const QScriptContext* scriptContext)
+{
+    QTestMessage ide_msg("context");
+    int i=0;
+    for (const QScriptContext *c = scriptContext;
+            c && c->parentContext();
+            c = c->parentContext(), ++i) {
+        QVariantMap contextMap;
+        contextToMap(c, contextMap);
+        ide_msg[QString("context_%1").arg(i)] = contextMap;
+    }
+    ide_msg["context_count"] = i;
+    QTestMessage reply;
+    m_remote.sendMessage( ide_msg, reply, -1 );
+}
+
+void QTestIDE::eventRecordingStarted(const QString& file, int line, const QString& steps)
+{
+    if (m_remote.isConnected()) {
+        QTestMessage message("EVENT_RECORDING_STARTED");
+        message["file"] = file;
+        message["line"] = line;
+        message["steps"] = steps;
+        m_remote.postMessage( message );
+
+        m_remote.must_stop_event_recording = false;
+        m_remote.event_recording_aborted = false;
+    }
+}
+
+void QTestIDE::recordedCode(const QString &code)
+{
+    if (m_remote.isConnected()) {
+        QTestMessage ide_msg("recordedCode");
+        ide_msg["code"] = code;
+        m_remote.postMessage( ide_msg );
+    }
+}
+
+bool QTestIDE::mustStopEventRecording() {
+    return m_remote.must_stop_event_recording;
+}
+
+bool QTestIDE::eventRecordingAborted() {
+    return m_remote.event_recording_aborted;
+}
+
+void QTestIDE::failureScreenshot(const QString &screenshot, const QString &file, int line, const QString &function)
+{
+    if (m_remote.isConnected()) {
+        QTestMessage msg("failure_screenshot");
+        msg["screenshot"]   = screenshot;
+        msg["filename"]     = file;
+        msg["line"]         = line;
+        msg["testfunction"] = function;
+        m_remote.postMessage(msg);
+    }
+}
+
+void QTestIDE::newTestData(const QString &file)
+{
+    if (m_remote.isConnected()) {
+        QTestMessage msg("NEW_TESTDATA");
+        msg["filename"] = file;
+        m_remote.postMessage(msg);
+    }
+}
+
+bool QTestIDE::verifyImage(const QPixmap &actual, const QPixmap &expected, const QString &comment)
+{
+    QTestMessage returnValue;
+    QTestMessage msg("VERIFY_IMAGE");
+    msg["actual"] = actual;
+    msg["expected"] = expected;
+    msg["comment"] = comment;
+
+    if (m_remote.sendMessage( msg, returnValue, -1 ) && returnValue["status"] == "OK") {
+        return returnValue["accepted"].toBool();
+    } else {
+        return false;
+//        return fail( "Verification of pixmap not possible: remote test tool did not correctly respond." );
+    }
+}
+
+void QTestIDE::contextToMap(const QScriptContext* scriptContext, QVariantMap &contextMap)
+{
+    QVariantMap vars;
+    QScriptContextInfo ctxInfo(scriptContext);
+    
+    QScriptValue locals = scriptContext->activationObject();
+    if (!locals.isValid()) return;
+    QScriptValueIterator it(locals);
+    while (it.hasNext()) {
+        it.next();
+        if (!it.value().toVariant().isValid()) {
+          continue;
+        }
+        vars[it.name()] = it.value().toVariant();
+    }
+
+    contextMap["vars"] = vars;
+    contextMap["file"] = ctxInfo.fileName();                
+    contextMap["line"] = ctxInfo.lineNumber();
+
+    if (ctxInfo.functionName().isEmpty()) {
+        contextMap["function"] = m_sysTest->currentTestFunction();
+    } else {
+        contextMap["function"] = ctxInfo.functionName();
+        contextMap["funcStart"] = ctxInfo.functionStartLineNumber();
+        contextMap["funcEnd"] = ctxInfo.functionEndLineNumber();
+    }
+}
\ No newline at end of file
diff --git a/libqsystemtest/qtestide.h b/libqsystemtest/qtestide.h
new file mode 100644
index 0000000..1f7b27c
--- /dev/null
+++ b/libqsystemtest/qtestide.h
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of QtUiTest.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTESTIDE_H
+#define QTESTIDE_H
+
+#include "qtestremote_p.h"
+#include <QVariantMap>
+
+class QSystemTest;
+class QString;
+class QScriptContext;
+
+class QSYSTEMTEST_EXPORT QTestIDE : public QObject
+{
+    Q_OBJECT
+
+public:
+    QTestIDE(QSystemTest*);
+    virtual ~QTestIDE();
+
+    void openRemote( const QString &ip, int port );
+    bool isConnected();
+//    virtual void processMessage( QTestMessage *msg );
+
+    bool queryBreakpoint(const QString&, int, const QString&, int);
+    void breakpointContext(const QScriptContext*);
+    
+    void eventRecordingStarted(const QString&, int, const QString&);
+    void recordedCode(const QString&);
+    bool mustStopEventRecording();
+    bool eventRecordingAborted();
+    
+    void failureScreenshot(const QString&, const QString&, int, const QString&);
+    void newTestData(const QString&);
+    bool verifyImage(const QPixmap &, const QPixmap&, const QString&);
+
+signals:
+    void abort();
+    
+private:
+    void contextToMap(const QScriptContext* scriptContext, QVariantMap&);
+    bool must_stop_event_recording;
+    bool event_recording_aborted;
+    QTestRemote m_remote;
+    QSystemTest *m_sysTest;
+
+};
+
+#endif
diff --git a/libqtslave/libqtslave.pro b/libqtslave/libqtslave.pro
index c44e34d..bd7e992 100644
--- a/libqtslave/libqtslave.pro
+++ b/libqtslave/libqtslave.pro
@@ -55,7 +55,3 @@ mac {
     CONFIG(release,debug|release): LIBS += -L$$BUILDROOT/lib -lqtuitest
 }
 
-
-
-target.path += \
-    /usr/local/lib
\ No newline at end of file
diff --git a/libqtuitest/libqtuitest.pro b/libqtuitest/libqtuitest.pro
index bcd9beb..615577e 100644
--- a/libqtuitest/libqtuitest.pro
+++ b/libqtuitest/libqtuitest.pro
@@ -82,8 +82,3 @@ INCLUDEPATH+=$$PWD
 TARGET=qtuitest
 TARGET=$$qtLibraryTarget($$TARGET)
 CONFIG-=debug_and_release_target
-
-
-
-target.path += \
-    /usr/local/lib
\ No newline at end of file
diff --git a/plugins/qtuitest_widgets/hbwidgets/hbwidgets.pro b/plugins/qtuitest_widgets/hbwidgets/hbwidgets.pro
index b455eea..fc85149 100644
--- a/plugins/qtuitest_widgets/hbwidgets/hbwidgets.pro
+++ b/plugins/qtuitest_widgets/hbwidgets/hbwidgets.pro
@@ -59,6 +59,3 @@ mac {
     CONFIG(release,debug|release): LIBS += -L$$BUILDROOT/lib -lqtuitest
 }
 
-
-target.path += \
-    /usr/local/lib
\ No newline at end of file
diff --git a/plugins/qtuitest_widgets/qgraphicsviewwidgets/qgraphicsviewwidgets.pro b/plugins/qtuitest_widgets/qgraphicsviewwidgets/qgraphicsviewwidgets.pro
index 6129f33..98a9d13 100644
--- a/plugins/qtuitest_widgets/qgraphicsviewwidgets/qgraphicsviewwidgets.pro
+++ b/plugins/qtuitest_widgets/qgraphicsviewwidgets/qgraphicsviewwidgets.pro
@@ -51,7 +51,3 @@ mac {
     CONFIG(release,debug|release): LIBS += -L$$BUILDROOT/lib -lqtuitest
 }
 
-
-
-target.path += \
-    /usr/local/lib
\ No newline at end of file
diff --git a/plugins/qtuitest_widgets/qmlwidgets/qmlwidgets.pro b/plugins/qtuitest_widgets/qmlwidgets/qmlwidgets.pro
index d635b3b..0c606a1 100644
--- a/plugins/qtuitest_widgets/qmlwidgets/qmlwidgets.pro
+++ b/plugins/qtuitest_widgets/qmlwidgets/qmlwidgets.pro
@@ -50,6 +50,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 463b25f..d95d9aa 100644
--- a/plugins/qtuitest_widgets/qtwidgets/qtwidgets.pro
+++ b/plugins/qtuitest_widgets/qtwidgets/qtwidgets.pro
@@ -105,6 +105,3 @@ contains(QT_CONFIG, webkit) {
     HEADERS+=testwebview.h
 }
 
-
-target.path += \
-    /usr/local/lib
\ No newline at end of file
diff --git a/plugins/styles/qtuitest/qtuitest.pro b/plugins/styles/qtuitest/qtuitest.pro
index 747a07e..56343fe 100644
--- a/plugins/styles/qtuitest/qtuitest.pro
+++ b/plugins/styles/qtuitest/qtuitest.pro
@@ -42,7 +42,3 @@ win32 {
     INSTALLS+=target
 }
 
-
-
-target.path += \
-    /usr/local/lib
\ No newline at end of file
diff --git a/qtbindings/qtscript_core/qtscript_core.pro b/qtbindings/qtscript_core/qtscript_core.pro
index 5b7f14d..3eec767 100644
--- a/qtbindings/qtscript_core/qtscript_core.pro
+++ b/qtbindings/qtscript_core/qtscript_core.pro
@@ -7,9 +7,3 @@ symbian {
     TARGET.EPOCALLOWDLLDATA=1
 }
 
-
-target.path += \
-    /usr/local/lib
-
-INSTALLS += \
-    target
\ No newline at end of file
diff --git a/qtuitest-for-creator.pro b/qtuitest-for-creator.pro
index b861e03..fdf8184 100644
--- a/qtuitest-for-creator.pro
+++ b/qtuitest-for-creator.pro
@@ -2,6 +2,5 @@ TEMPLATE=subdirs
 SUBDIRS+=libqtuitest libqtslave plugins qtbindings libqsystemtest interpreter
 CONFIG+=ordered
 
-!no_examples:SUBDIRS+=examples
 !no_tests:SUBDIRS+=tests
 
diff --git a/qtuitest-host.pri b/qtuitest-host.pri
index 0d80a8b..926de33 100644
--- a/qtuitest-host.pri
+++ b/qtuitest-host.pri
@@ -34,6 +34,7 @@ HEADERS +=\
 #        $$QTUITEST_SRC/libqsystemtest/gracefulquit.h \
         $$QTUITEST_SRC/libqsystemtest/qabstracttest.h \
         $$QTUITEST_SRC/libqsystemtest/qsystemtest.h \
+        $$QTUITEST_SRC/libqsystemtest/qtestide.h \
         $$QTUITEST_SRC/libqsystemtest/testdevicecontrol.h
 
 SOURCES +=\
@@ -44,6 +45,7 @@ SOURCES +=\
         $$QTUITEST_SRC/libqsystemtest/qsystemtest.cpp \
         $$QTUITEST_SRC/libqsystemtest/qsystemtest_p.cpp \
         $$QTUITEST_SRC/libqsystemtest/qsystemtestmaster.cpp \
+        $$QTUITEST_SRC/libqsystemtest/qtestide.cpp \
         $$QTUITEST_SRC/libqsystemtest/testdevicecontrol.cpp
 
 HEADERS*=$$SEMI_PRIVATE_HEADERS $$PRIVATE_HEADERS
diff --git a/tests/qtuitest/sys_assistant/sys_assistant.pro b/tests/qtuitest/sys_assistant/sys_assistant.pro
index a057ba3..79485c9 100644
--- a/tests/qtuitest/sys_assistant/sys_assistant.pro
+++ b/tests/qtuitest/sys_assistant/sys_assistant.pro
@@ -1,9 +1,2 @@
 SOURCES=sys_assistant.qtt
 CONFIG+=systemtest
-
-
-target.path += \
-    /usr/local/bin
-
-INSTALLS += \
-    target
\ No newline at end of file
diff --git a/tests/qtuitest/sys_designer/sys_designer.pro b/tests/qtuitest/sys_designer/sys_designer.pro
index 2fa97f5..a394b57 100644
--- a/tests/qtuitest/sys_designer/sys_designer.pro
+++ b/tests/qtuitest/sys_designer/sys_designer.pro
@@ -1,9 +1,2 @@
 SOURCES=sys_designer.qtt
 CONFIG+=systemtest
-
-
-target.path += \
-    /usr/local/bin
-
-INSTALLS += \
-    target
\ No newline at end of file
diff --git a/tests/qtuitest/sys_graphicsView/sys_graphicsView.pro b/tests/qtuitest/sys_graphicsView/sys_graphicsView.pro
index a74cb42..c428705 100644
--- a/tests/qtuitest/sys_graphicsView/sys_graphicsView.pro
+++ b/tests/qtuitest/sys_graphicsView/sys_graphicsView.pro
@@ -2,9 +2,3 @@ SOURCES=sys_graphicsView.qtt
 TESTAPPS=graphicsViewTest
 CONFIG+=systemtest
 
-
-target.path += \
-    /usr/local/bin
-
-INSTALLS += \
-    target
\ No newline at end of file
diff --git a/tests/qtuitest/sys_input/sys_input.pro b/tests/qtuitest/sys_input/sys_input.pro
index ada46f4..e4f4b29 100644
--- a/tests/qtuitest/sys_input/sys_input.pro
+++ b/tests/qtuitest/sys_input/sys_input.pro
@@ -2,9 +2,3 @@ SOURCES=sys_input.qtt
 TESTAPPS=testapp1 testapp2 testapp3
 CONFIG+=systemtest
 
-target.path += \
-    /usr/local/bin
-
-INSTALLS += \
-    target
-
diff --git a/tests/qtuitest/sys_linguist/sys_linguist.pro b/tests/qtuitest/sys_linguist/sys_linguist.pro
index 0f2a803..37e8d88 100644
--- a/tests/qtuitest/sys_linguist/sys_linguist.pro
+++ b/tests/qtuitest/sys_linguist/sys_linguist.pro
@@ -1,9 +1,3 @@
 SOURCES=sys_linguist.qtt
 CONFIG+=systemtest
 
-
-target.path += \
-    /usr/local/bin
-
-INSTALLS += \
-    target
\ No newline at end of file
diff --git a/tests/qtuitest/testapps/fileDialogSaveApp/fileDialogSaveApp.pro b/tests/qtuitest/testapps/fileDialogSaveApp/fileDialogSaveApp.pro
index d5ae363..00202d6 100644
--- a/tests/qtuitest/testapps/fileDialogSaveApp/fileDialogSaveApp.pro
+++ b/tests/qtuitest/testapps/fileDialogSaveApp/fileDialogSaveApp.pro
@@ -13,10 +13,3 @@ unix:!maemo* {
 
 # Input
 SOURCES += main.cpp
-
-
-target.path += \
-    /usr/local/bin
-
-INSTALLS += \
-    target
diff --git a/tests/qtuitest/testapps/graphicsViewTest/graphicsViewTest.pro b/tests/qtuitest/testapps/graphicsViewTest/graphicsViewTest.pro
index 798a1ac..e1c4f6a 100644
--- a/tests/qtuitest/testapps/graphicsViewTest/graphicsViewTest.pro
+++ b/tests/qtuitest/testapps/graphicsViewTest/graphicsViewTest.pro
@@ -9,9 +9,4 @@ unix:!maemo* {
 
 HEADERS += mainwindow.h
 SOURCES += main.cpp mainwindow.cpp
-
-target.path += \
-    /usr/local/bin
-
-INSTALLS += \
-    target
+mac:DESTDIR=$$BUILDROOT/bin
diff --git a/tests/qtuitest/testapps/testapp1/testapp1.pro b/tests/qtuitest/testapps/testapp1/testapp1.pro
index b6f8cf2..02e87bd 100644
--- a/tests/qtuitest/testapps/testapp1/testapp1.pro
+++ b/tests/qtuitest/testapps/testapp1/testapp1.pro
@@ -21,9 +21,3 @@ mac {
     CONFIG-=app_bundle
 }
 
-
-target.path += \
-    /usr/local/bin
-
-INSTALLS += \
-    target
diff --git a/tests/qtuitest/testapps/testapp2/testapp2.pro b/tests/qtuitest/testapps/testapp2/testapp2.pro
index b63b114..b5e53bf 100644
--- a/tests/qtuitest/testapps/testapp2/testapp2.pro
+++ b/tests/qtuitest/testapps/testapp2/testapp2.pro
@@ -18,10 +18,3 @@ win32 {
 mac {
     CONFIG-=app_bundle
 }
-
-
-target.path += \
-    /usr/local/bin
-
-INSTALLS += \
-    target
diff --git a/tests/qtuitest/testapps/testapp3/testapp3.pro b/tests/qtuitest/testapps/testapp3/testapp3.pro
index b63b114..a6ed170 100644
--- a/tests/qtuitest/testapps/testapp3/testapp3.pro
+++ b/tests/qtuitest/testapps/testapp3/testapp3.pro
@@ -19,9 +19,3 @@ mac {
     CONFIG-=app_bundle
 }
 
-
-target.path += \
-    /usr/local/bin
-
-INSTALLS += \
-    target
diff --git a/tests/qtuitest/testapps/testapp4/testapp4.pro b/tests/qtuitest/testapps/testapp4/testapp4.pro
index b63b114..b5e53bf 100644
--- a/tests/qtuitest/testapps/testapp4/testapp4.pro
+++ b/tests/qtuitest/testapps/testapp4/testapp4.pro
@@ -18,10 +18,3 @@ win32 {
 mac {
     CONFIG-=app_bundle
 }
-
-
-target.path += \
-    /usr/local/bin
-
-INSTALLS += \
-    target
diff --git a/tests/qtuitest/tst_qalternatestack/tst_qalternatestack.pro b/tests/qtuitest/tst_qalternatestack/tst_qalternatestack.pro
index ebdfda7..188e9ef 100644
--- a/tests/qtuitest/tst_qalternatestack/tst_qalternatestack.pro
+++ b/tests/qtuitest/tst_qalternatestack/tst_qalternatestack.pro
@@ -16,9 +16,3 @@ symbian {
     LIBS += -L$$BUILDROOT/lib
 }
 LIBS += -lqtuitest
-
-target.path += \
-    /usr/local/bin
-
-INSTALLS += \
-    target
diff --git a/tests/qtuitest/tst_qelapsedtimer/tst_qelapsedtimer.pro b/tests/qtuitest/tst_qelapsedtimer/tst_qelapsedtimer.pro
index 3b4ba78..e260b41 100644
--- a/tests/qtuitest/tst_qelapsedtimer/tst_qelapsedtimer.pro
+++ b/tests/qtuitest/tst_qelapsedtimer/tst_qelapsedtimer.pro
@@ -18,8 +18,3 @@ symbian {
 }
 LIBS += -lqtuitest
 
-target.path += \
-    /usr/local/bin
-
-INSTALLS += \
-    target
diff --git a/tests/qtuitest/tst_qinputgenerator/tst_qinputgenerator.pro b/tests/qtuitest/tst_qinputgenerator/tst_qinputgenerator.pro
index c1b023f..45664e7 100644
--- a/tests/qtuitest/tst_qinputgenerator/tst_qinputgenerator.pro
+++ b/tests/qtuitest/tst_qinputgenerator/tst_qinputgenerator.pro
@@ -24,8 +24,3 @@ symbian {
 }
 LIBS += -lqtuitest
 
-target.path += \
-    /usr/local/bin
-
-INSTALLS += \
-    target
diff --git a/tests/qtuitest/tst_qtestprotocol/tst_qtestprotocol.pro b/tests/qtuitest/tst_qtestprotocol/tst_qtestprotocol.pro
index c36286b..f7c146a 100644
--- a/tests/qtuitest/tst_qtestprotocol/tst_qtestprotocol.pro
+++ b/tests/qtuitest/tst_qtestprotocol/tst_qtestprotocol.pro
@@ -21,10 +21,3 @@ symbian {
 }else{
     LIBS += -L$$BUILDROOT/lib
 }
-LIBS += -lqtuitest
-
-target.path += \
-    /usr/local/bin
-
-INSTALLS += \
-    target
diff --git a/tests/qtuitest/tst_qtuitestnamespace/tst_qtuitestnamespace.pro b/tests/qtuitest/tst_qtuitestnamespace/tst_qtuitestnamespace.pro
index 004e5a9..0ce445d 100644
--- a/tests/qtuitest/tst_qtuitestnamespace/tst_qtuitestnamespace.pro
+++ b/tests/qtuitest/tst_qtuitestnamespace/tst_qtuitestnamespace.pro
@@ -11,8 +11,3 @@ CONFIG-=debug_and_release_target
 SOURCES+=                   \
     tst_qtuitestnamespace.cpp
 
-target.path += \
-    /usr/local/bin
-
-INSTALLS += \
-    target
diff --git a/tests/qtuitest/tst_qtuitestwidgets/tst_qtuitestwidgets.pro b/tests/qtuitest/tst_qtuitestwidgets/tst_qtuitestwidgets.pro
index 5fe2009..d78c765 100644
--- a/tests/qtuitest/tst_qtuitestwidgets/tst_qtuitestwidgets.pro
+++ b/tests/qtuitest/tst_qtuitestwidgets/tst_qtuitestwidgets.pro
@@ -22,8 +22,3 @@ win32 {
     LIBS+=$$OUT_PWD/../../lib/qtuitest.lib
 }
 
-target.path += \
-    /usr/local/bin
-
-INSTALLS += \
-    target