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

QmlJSDebug: Move qmljsdebug into a static library

Browse Source 
Reviewed-by: dt
This commit is contained in:
Kai Koehne
2011-01-12 16:24:00 +01:00
parent 45187a15a7
commit 3fef120d59
30 changed files with 750 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qt4projectmanager/qmlobservertool.cpp
View File

@@ -107,12 +107,13 @@ QStringList QmlObserverTool::locationsByInstallData(const QString &qtInstallData
bool QmlObserverTool::build(const QString &directory, const QString &makeCommand,
const QString &qmakeCommand, const QString &mkspec,
const Utils::Environment &env, const QString &targetMode,
QString *output, QString *errorMessage)
const QStringList &qmakeArguments, QString *output,
QString *errorMessage)
{
return buildHelper(QCoreApplication::translate("Qt4ProjectManager::QmlObserverTool", "QMLObserver"),
QLatin1String("qmlobserver.pro"),
directory, makeCommand, qmakeCommand, mkspec, env, targetMode,
output, errorMessage);
qmakeArguments, output, errorMessage);
}
static inline bool mkpath(const QString &targetDirectory, QString *errorMessage)
@@ -129,10 +130,8 @@ QString QmlObserverTool::copy(const QString &qtInstallData, QString *errorMessag
const QStringList directories = QmlObserverTool::installDirectories(qtInstallData);
QString sourcePath = Core::ICore::instance()->resourcePath() + QLatin1String("/qml/qmlobserver/");
QString libSourcePath = Core::ICore::instance()->resourcePath() + QLatin1String("/qml/qmljsdebugger/");
QStringList observerFiles = recursiveFileList(QDir(sourcePath));
QStringList qmljsDebuggerFiles = recursiveFileList(QDir(libSourcePath));
// Try to find a writeable directory.
foreach(const QString &directory, directories) {
@@ -142,10 +141,7 @@ QString QmlObserverTool::copy(const QString &qtInstallData, QString *errorMessag
errorMessage->clear();
}
if (copyFiles(sourcePath, observerFiles, directory, errorMessage)
&& copyFiles(libSourcePath, qmljsDebuggerFiles,
directory + QLatin1String("/qmljsdebugger/"), errorMessage))
{
if (copyFiles(sourcePath, observerFiles, directory, errorMessage)) {
errorMessage->clear();
return directory;
}