From: Bill King <bill.king@nokia.com>
Date: Fri, 3 Dec 2010 01:14:01 +0000 (+1000)
Subject: tests: make compile
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4507d6434576015a5c705c22a57ba012fd706d32;p=qt-creator-jp%2Fqt-creator-jp.git

tests: make compile
---

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index a041af7053..92fe3c51f1 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -16,6 +16,6 @@ SUBDIRS += \
     utils_stringutils \
     filesearch
 
-contains (QT_CONFIG, declarative) {
-SUBDIRS += qml
-}
+#contains (QT_CONFIG, declarative) {
+#SUBDIRS += qml
+#}
diff --git a/tests/auto/debugger/tst_gdb.cpp b/tests/auto/debugger/tst_gdb.cpp
index 1fe8bbf591..41e7109970 100644
--- a/tests/auto/debugger/tst_gdb.cpp
+++ b/tests/auto/debugger/tst_gdb.cpp
@@ -71,7 +71,7 @@ bool checkUninitialized = false;
 #ifdef Q_OS_WIN
 QString gdbBinary = "c:\\MinGw\\bin\\gdb.exe";
 #else
-QString gdbBinary = "./gdb";
+QString gdbBinary = "gdb";
 #endif
 
 void nothing() {}
diff --git a/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp b/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp
index b058c35bb9..bd9de649f4 100644
--- a/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp
+++ b/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp
@@ -192,14 +192,14 @@ void tst_PluginSpec::locationAndPath()
 {
     Internal::PluginSpecPrivate spec(0);
     QVERIFY(spec.read("testspecs/simplespec.xml"));
-    QCOMPARE(spec.location, QDir::currentPath()+"/testspecs");
-    QCOMPARE(spec.filePath, QDir::currentPath()+"/testspecs/simplespec.xml");
+    QCOMPARE(spec.location, QString(QDir::currentPath()+"/testspecs"));
+    QCOMPARE(spec.filePath, QString(QDir::currentPath()+"/testspecs/simplespec.xml"));
     QVERIFY(spec.read("testdir/../testspecs/simplespec.xml"));
-    QCOMPARE(spec.location, QDir::currentPath()+"/testspecs");
-    QCOMPARE(spec.filePath, QDir::currentPath()+"/testspecs/simplespec.xml");
+    QCOMPARE(spec.location, QString(QDir::currentPath()+"/testspecs"));
+    QCOMPARE(spec.filePath, QString(QDir::currentPath()+"/testspecs/simplespec.xml"));
     QVERIFY(spec.read("testdir/spec.xml"));
-    QCOMPARE(spec.location, QDir::currentPath()+"/testdir");
-    QCOMPARE(spec.filePath, QDir::currentPath()+"/testdir/spec.xml");
+    QCOMPARE(spec.location, QString(QDir::currentPath()+"/testdir"));
+    QCOMPARE(spec.filePath, QString(QDir::currentPath()+"/testdir/spec.xml"));
 }
 
 void tst_PluginSpec::resolveDependencies()
diff --git a/tests/manual/ssh/ssh.pri b/tests/manual/ssh/ssh.pri
index e41fd2d3ac..fab9b5d4e6 100644
--- a/tests/manual/ssh/ssh.pri
+++ b/tests/manual/ssh/ssh.pri
@@ -1,6 +1,8 @@
 include (../../../qtcreator.pri)
 include (../../../src/plugins/coreplugin/coreplugin.pri)
 
+LIBS += -L$$IDE_PLUGIN_PATH/Nokia
+
 macx:QMAKE_LFLAGS += -Wl,-rpath,\"$$IDE_BIN_PATH/..\"
 INCLUDEPATH *= $$IDE_SOURCE_TREE/src/plugins
 LIBS *= -L$$IDE_LIBRARY_PATH/Nokia
diff --git a/tests/tools/trklauncher/main.cpp b/tests/tools/trklauncher/main.cpp
index eb699e3574..6f353db777 100644
--- a/tests/tools/trklauncher/main.cpp
+++ b/tests/tools/trklauncher/main.cpp
@@ -130,7 +130,7 @@ static TrkLauncherPtr parseArguments(const QStringList &arguments, bool *bluetoo
             TrkLauncherPtr launcher = createLauncher(actions, arguments.at(a), serialFrame, verbosity);
             launcher->addStartupActions(trk::Launcher::ActionRun);
             launcher->setFileName(arguments.at(a + 1));
-            launcher->setCommandLineArgs(remoteArguments);
+            launcher->setCommandLineArgs(remoteArguments.join(" "));
             return launcher;
 
         }
@@ -142,7 +142,7 @@ static TrkLauncherPtr parseArguments(const QStringList &arguments, bool *bluetoo
             if (remainingArgsCount == 3) {
                 launcher->addStartupActions(trk::Launcher::ActionRun);
                 launcher->setFileName(arguments.at(a + 2));
-                launcher->setCommandLineArgs(remoteArguments);
+                launcher->setCommandLineArgs(remoteArguments.join(" "));
             }
             return launcher;
         }
@@ -155,7 +155,7 @@ static TrkLauncherPtr parseArguments(const QStringList &arguments, bool *bluetoo
             if (remainingArgsCount == 4) {
                 launcher->addStartupActions(trk::Launcher::ActionRun);
                 launcher->setFileName(arguments.at(a + 3));
-                launcher->setCommandLineArgs(remoteArguments);
+                launcher->setCommandLineArgs(remoteArguments.join(" "));
             }
             return launcher;
         }