diff options
author | Kai Koehne <kai.koehne@nokia.com> | 2010-08-19 16:51:27 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@nokia.com> | 2010-08-19 17:22:13 +0200 |
commit | 60fffda9eb1f51cea6de74fb131b1d0d6bb6bbfd (patch) | |
tree | ffd98a8d7bf6ed8423b003f3dd60f4b13dc27090 /src/plugins/qt4projectmanager/qt4projectmanager.pro | |
parent | 420a2b4e6efdae067728d8a552016ed614f1d541 (diff) | |
download | qt-creator-60fffda9eb1f51cea6de74fb131b1d0d6bb6bbfd.tar.gz |
QmlProject: Search for qmlviewer in configured Qt versions (if not found in $PATH)
If no 'qmlviewer' executable is found in the PATH, iterate through the
list of configured Qt versions and try to find a qmlviewer there. This
should help users configuring creator such to play with Qml.
Right now the first qmlviewer found in a Qt version is selected. A UI
to let the user select one explicitly was not possible any more (string
freeze).
This requires a dependency from QmlProjectManager to
Qt4ProjectManager.
Reviewed-by: dt
Diffstat (limited to 'src/plugins/qt4projectmanager/qt4projectmanager.pro')
-rw-r--r-- | src/plugins/qt4projectmanager/qt4projectmanager.pro | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.pro b/src/plugins/qt4projectmanager/qt4projectmanager.pro index f4c492ac33..28f45408b6 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanager.pro +++ b/src/plugins/qt4projectmanager/qt4projectmanager.pro @@ -1,5 +1,6 @@ TEMPLATE = lib TARGET = Qt4ProjectManager +DEFINES += QT4PROJECTMANAGER_LIBRARY QT += network include(../../qtcreatorplugin.pri) include(qt4projectmanager_dependencies.pri) @@ -44,7 +45,8 @@ HEADERS += qt4projectmanagerplugin.h \ gettingstartedwelcomepage.h \ qt4buildconfiguration.h \ qt4target.h \ - qmakeparser.h + qmakeparser.h \ + qt4projectmanager_global.h SOURCES += qt4projectmanagerplugin.cpp \ qt4projectmanager.cpp \ qt4project.cpp \ |