diff options
author | Kai Koehne <kai.koehne@nokia.com> | 2010-09-29 16:40:13 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@nokia.com> | 2010-09-30 12:02:26 +0200 |
commit | 88a36fe34c49ebcaddb701ae890014276ac4bb8f (patch) | |
tree | 6c1b85c63d36dd012a5739015ef782da7c9d0baa /src/plugins/qt4projectmanager/qmlobservertool.cpp | |
parent | a9514a388278524e2a261c32f15cad3503e33522 (diff) | |
download | qt-creator-88a36fe34c49ebcaddb701ae890014276ac4bb8f.tar.gz |
DebuggingHelpers: Check for Qt version instead checking private files
The location private includes might still change with 4.7.1 . Better
check the qt version string.
Reviewed-by: Lasse Holmstedt
Diffstat (limited to 'src/plugins/qt4projectmanager/qmlobservertool.cpp')
-rw-r--r-- | src/plugins/qt4projectmanager/qmlobservertool.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qt4projectmanager/qmlobservertool.cpp b/src/plugins/qt4projectmanager/qmlobservertool.cpp index 3a64da2ed7..7b556f2a31 100644 --- a/src/plugins/qt4projectmanager/qmlobservertool.cpp +++ b/src/plugins/qt4projectmanager/qmlobservertool.cpp @@ -32,6 +32,7 @@ #include "qt4project.h" #include "qt4projectmanagerconstants.h" #include <coreplugin/icore.h> +#include <utils/qtcassert.h> #include <projectexplorer/project.h> #include <QDesktopServices> @@ -50,10 +51,9 @@ static inline QStringList validBinaryFilenames() << QLatin1String("QMLObserver.app/Contents/MacOS/QMLObserver"); } -bool QmlObserverTool::canBuild(const QString &installHeadersDir) +bool QmlObserverTool::canBuild(QtVersion *qtVersion) { - QString qDeclHeader = installHeadersDir + QLatin1String("/QtDeclarative/private/qdeclarativemetatype_p.h"); - return QFile::exists(qDeclHeader); + return checkMinimumQtVersion(qtVersion->qtVersionString(), 4, 7, 1); } QString QmlObserverTool::toolForProject(ProjectExplorer::Project *project) |