Commit 4507d643 authored by Bill King's avatar Bill King
Browse files

tests: make compile

parent c6a4c233
......@@ -16,6 +16,6 @@ SUBDIRS += \
utils_stringutils \
filesearch
contains (QT_CONFIG, declarative) {
SUBDIRS += qml
}
#contains (QT_CONFIG, declarative) {
#SUBDIRS += qml
#}
......@@ -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() {}
......
......@@ -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()
......
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
......
......@@ -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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment