feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJSDebug: Enable compilation of library also for Symbian

Browse Source
This commit is contained in:
Kai Koehne
2011-04-29 14:07:14 +02:00
parent 001793fe79
commit af9a307c15
6 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
share/qtcreator/qml/qmljsdebugger/qmljsdebugger-lib.pri
View File

@@ -4,10 +4,15 @@
QT += declarative script QT += declarative script
INCLUDEPATH += $$PWD/include INCLUDEPATH += $$PWD/include
DEBUGLIB=QmlJSDebugger symbian {
LIBNAME = QmLJSDebugger.lib
} else {
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
windows:DEBUGLIB = QmlJSDebuggerd LIBNAME = QmlJSDebuggerd
} else {
LIBNAME = QmlJSDebugger
} }
LIBS += -L$$PWD -l$$DEBUGLIB }
LIBS += -L$$PWD -l$$LIBNAME
DEFINES += QMLJSDEBUGGER DEFINES += QMLJSDEBUGGER

4
src/libs/utils/buildablehelperlibrary.cpp
View File

@@ -273,8 +273,8 @@ bool BuildableHelperLibrary::buildHelper(const BuildHelperArguments &arguments,
return false; return false;
} }
log->append(QCoreApplication::translate("ProjectExplorer::BuildableHelperLibrary", log->append(QCoreApplication::translate("ProjectExplorer::BuildableHelperLibrary",
"Running %1 ...\n").arg(makeFullPath)); "Running %1 %2 ...\n").arg(makeFullPath, arguments.makeArguments.join(" ")));
if (!runBuildProcess(proc, makeFullPath, QStringList(), 120000, false, log, errorMessage)) if (!runBuildProcess(proc, makeFullPath, arguments.makeArguments, 120000, false, log, errorMessage))
return false; return false;
return true; return true;
} }

1
src/libs/utils/buildablehelperlibrary.h
View File

@@ -80,6 +80,7 @@ public:
QStringList qmakeArguments; QStringList qmakeArguments;
QString makeCommand; QString makeCommand;
QStringList makeArguments;
}; };
static bool buildHelper(const BuildHelperArguments &arguments, static bool buildHelper(const BuildHelperArguments &arguments,

2
src/plugins/qt4projectmanager/debugginghelperbuildtask.cpp
View File

@@ -175,8 +175,10 @@ bool DebuggingHelperBuildTask::buildDebuggingHelper(QFutureInterface<void> &futu
if (qmlDebuggingDirectory.isEmpty()) if (qmlDebuggingDirectory.isEmpty())
return false; return false;
arguments.directory = qmlDebuggingDirectory; arguments.directory = qmlDebuggingDirectory;
arguments.makeArguments += QLatin1String("all"); // build debug and release
if (!QmlDebuggingLibrary::build(arguments, output, &m_errorMessage)) if (!QmlDebuggingLibrary::build(arguments, output, &m_errorMessage))
return false; return false;
arguments.makeArguments.clear();
} }
future.setProgressValue(4); future.setProgressValue(4);

3
src/plugins/qt4projectmanager/qmakestep.cpp
View File

@@ -333,8 +333,7 @@ bool QMakeStep::isQmlDebuggingLibrarySupported(QString *reason) const
if (!qt4BuildConfiguration()->qtVersion()->qtAbis().isEmpty()) { if (!qt4BuildConfiguration()->qtVersion()->qtAbis().isEmpty()) {
ProjectExplorer::Abi abi = qt4BuildConfiguration()->qtVersion()->qtAbis().first(); ProjectExplorer::Abi abi = qt4BuildConfiguration()->qtVersion()->qtAbis().first();
if (abi.os() == ProjectExplorer::Abi::SymbianOS if (abi.osFlavor() == ProjectExplorer::Abi::MaemoLinuxFlavor) {
|| abi.osFlavor() == ProjectExplorer::Abi::MaemoLinuxFlavor) {
if (reason) if (reason)
reason->clear(); reason->clear();
// *reason = tr("Qml debugging on device not yet supported."); // *reason = tr("Qml debugging on device not yet supported.");

1
src/plugins/qt4projectmanager/qmldebugginglibrary.cpp
View File

@@ -61,6 +61,7 @@ QString QmlDebuggingLibrary::libraryByInstallData(const QString &qtInstallData,
binFilenames << QLatin1String("QmlJSDebugger.lib"); binFilenames << QLatin1String("QmlJSDebugger.lib");
} }
binFilenames << QLatin1String("libQmlJSDebugger.a"); binFilenames << QLatin1String("libQmlJSDebugger.a");
binFilenames << QLatin1String("QmlJSDebugger.prl"); // Symbian. Note that the actual lib is in EPOCROOT
return byInstallDataHelper(sourcePath(), sourceFileNames(), directories, binFilenames, false); return byInstallDataHelper(sourcePath(), sourceFileNames(), directories, binFilenames, false);
} }