Commit af9a307c authored by Kai Koehne's avatar Kai Koehne
Browse files

QmlJSDebug: Enable compilation of library also for Symbian

parent 001793fe
......@@ -4,10 +4,15 @@
QT += declarative script
INCLUDEPATH += $$PWD/include
DEBUGLIB=QmlJSDebugger
CONFIG(debug, debug|release) {
windows:DEBUGLIB = QmlJSDebuggerd
symbian {
LIBNAME = QmLJSDebugger.lib
} else {
CONFIG(debug, debug|release) {
LIBNAME = QmlJSDebuggerd
} else {
LIBNAME = QmlJSDebugger
}
}
LIBS += -L$$PWD -l$$DEBUGLIB
LIBS += -L$$PWD -l$$LIBNAME
DEFINES += QMLJSDEBUGGER
......@@ -273,8 +273,8 @@ bool BuildableHelperLibrary::buildHelper(const BuildHelperArguments &arguments,
return false;
}
log->append(QCoreApplication::translate("ProjectExplorer::BuildableHelperLibrary",
"Running %1 ...\n").arg(makeFullPath));
if (!runBuildProcess(proc, makeFullPath, QStringList(), 120000, false, log, errorMessage))
"Running %1 %2 ...\n").arg(makeFullPath, arguments.makeArguments.join(" ")));
if (!runBuildProcess(proc, makeFullPath, arguments.makeArguments, 120000, false, log, errorMessage))
return false;
return true;
}
......
......@@ -80,6 +80,7 @@ public:
QStringList qmakeArguments;
QString makeCommand;
QStringList makeArguments;
};
static bool buildHelper(const BuildHelperArguments &arguments,
......
......@@ -175,8 +175,10 @@ bool DebuggingHelperBuildTask::buildDebuggingHelper(QFutureInterface<void> &futu
if (qmlDebuggingDirectory.isEmpty())
return false;
arguments.directory = qmlDebuggingDirectory;
arguments.makeArguments += QLatin1String("all"); // build debug and release
if (!QmlDebuggingLibrary::build(arguments, output, &m_errorMessage))
return false;
arguments.makeArguments.clear();
}
future.setProgressValue(4);
......
......@@ -333,8 +333,7 @@ bool QMakeStep::isQmlDebuggingLibrarySupported(QString *reason) const
if (!qt4BuildConfiguration()->qtVersion()->qtAbis().isEmpty()) {
ProjectExplorer::Abi abi = qt4BuildConfiguration()->qtVersion()->qtAbis().first();
if (abi.os() == ProjectExplorer::Abi::SymbianOS
|| abi.osFlavor() == ProjectExplorer::Abi::MaemoLinuxFlavor) {
if (abi.osFlavor() == ProjectExplorer::Abi::MaemoLinuxFlavor) {
if (reason)
reason->clear();
// *reason = tr("Qml debugging on device not yet supported.");
......
......@@ -61,6 +61,7 @@ QString QmlDebuggingLibrary::libraryByInstallData(const QString &qtInstallData,
binFilenames << QLatin1String("QmlJSDebugger.lib");
}
binFilenames << QLatin1String("libQmlJSDebugger.a");
binFilenames << QLatin1String("QmlJSDebugger.prl"); // Symbian. Note that the actual lib is in EPOCROOT
return byInstallDataHelper(sourcePath(), sourceFileNames(), directories, binFilenames, false);
}
......
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