diff options
author | Kai Koehne <kai.koehne@nokia.com> | 2011-04-18 14:13:18 +0200 |
---|---|---|
committer | con <qtc-committer@nokia.com> | 2011-04-18 15:38:03 +0200 |
commit | f86c9b65726e879652561e6db04e6688bc48f48c (patch) | |
tree | 955e5213c9faab375f828e344997047638ca7efd /src/libs/utils/buildablehelperlibrary.h | |
parent | bf511a2bcb3d462b4c8ee286b6b64ce85a5f8755 (diff) |
QmlDump: Ensure that qmldump is found in QtSDKv2.2.0-rc1
We ship a precompiled qmldump in the Qt SDK because the Qt versions
don't have private headers. However, the logic in buildablehelperlibrary
by default rejects any build that is older than the latest changes to the
qmldump source code files; allow Qt Creator to pick up the (maybe
outdated) qmldump nevertheless if no private headers are installed.
Reviewed-by: ckamm
Task-number: QTCREATORBUG-4578
Diffstat (limited to 'src/libs/utils/buildablehelperlibrary.h')
-rw-r--r-- | src/libs/utils/buildablehelperlibrary.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libs/utils/buildablehelperlibrary.h b/src/libs/utils/buildablehelperlibrary.h index 13626da8ec7..ea4eefdcce9 100644 --- a/src/libs/utils/buildablehelperlibrary.h +++ b/src/libs/utils/buildablehelperlibrary.h @@ -61,7 +61,8 @@ public: static QString byInstallDataHelper(const QString &sourcePath, const QStringList &sourceFileNames, const QStringList &installDirectories, - const QStringList &validBinaryFilenames); + const QStringList &validBinaryFilenames, + bool acceptOutdatedHelper); static bool copyFiles(const QString &sourcePath, const QStringList &files, const QString &targetDirectory, QString *errorMessage); |