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

Compiled helpers: Use only ones that are newer than all source files.

Browse Source 
Reviewed-by: Kai Koehne
This commit is contained in:
Christian Kamm
2011-02-18 14:43:33 +01:00
parent 3593fe08ae
commit e236c5de5f
8 changed files with 71 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,12 +84,10 @@ QString QmlObserverTool::toolByInstallData(const QString &qtInstallData)
if (!Core::ICore::instance())
return QString();
const QString mainFilename = Core::ICore::instance()->resourcePath()
+ QLatin1String("/qml/qmlobserver/main.cpp");
const QStringList directories = installDirectories(qtInstallData);
const QStringList binFilenames = validBinaryFilenames();
return byInstallDataHelper(mainFilename, directories, binFilenames);
return byInstallDataHelper(sourcePath(), sourceFileNames(), directories, binFilenames);
}
QStringList QmlObserverTool::locationsByInstallData(const QString &qtInstallData)
@@ -129,10 +127,6 @@ QString QmlObserverTool::copy(const QString &qtInstallData, QString *errorMessag
{
const QStringList directories = QmlObserverTool::installDirectories(qtInstallData);
QString sourcePath = Core::ICore::instance()->resourcePath() + QLatin1String("/qml/qmlobserver/");
QStringList observerFiles = recursiveFileList(QDir(sourcePath));
// Try to find a writeable directory.
foreach(const QString &directory, directories) {
if (!mkpath(directory, errorMessage)) {
@@ -141,7 +135,7 @@ QString QmlObserverTool::copy(const QString &qtInstallData, QString *errorMessag
errorMessage->clear();
}
if (copyFiles(sourcePath, observerFiles, directory, errorMessage)) {
if (copyFiles(sourcePath(), sourceFileNames(), directory, errorMessage)) {
errorMessage->clear();
return directory;
}
@@ -182,4 +176,14 @@ QStringList QmlObserverTool::installDirectories(const QString &qtInstallData)
return directories;
}
QString QmlObserverTool::sourcePath()
{
return Core::ICore::instance()->resourcePath() + QLatin1String("/qml/qmlobserver/");
}
QStringList QmlObserverTool::sourceFileNames()
{
return recursiveFileList(QDir(sourcePath()));
}
} // namespace