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
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;
}
QStringList qmakeArguments;
QString makeCommand;
+ QStringList makeArguments;
};
static bool buildHelper(const BuildHelperArguments &arguments,
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);
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.");
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);
}