diff options
| author | Daniel Teske <daniel.teske@digia.com> | 2013-08-05 13:03:43 +0200 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@digia.com> | 2013-08-05 15:10:07 +0200 |
| commit | 84b479225e1b4b9487860ea68339293588f55e4a (patch) | |
| tree | c9d014c53957b51c6ed3bfbb008407d90d100b2b /src/plugins/qtsupport/qtoptionspage.cpp | |
| parent | e61c797c6d811d9ee3b7546af8fa05ee9ee2546b (diff) | |
| download | qt-creator-84b479225e1b4b9487860ea68339293588f55e4a.tar.gz | |
QtVersion: Special treatment for qthooser
Resolve which qmake qtchooser will forward too, as that qmake will put
it's path into the makefile.
Task-number: QTCREATORBUG-9841
Change-Id: Ib7a17c7683550ce3bb9172c7428a0efc328652f5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/qtsupport/qtoptionspage.cpp')
| -rw-r--r-- | src/plugins/qtsupport/qtoptionspage.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index 838dc5a0fd..e72dab656c 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -635,6 +635,12 @@ void QtOptionsPageWidget::addQtDir() QFileDialog::DontResolveSymlinks)); if (qtVersion.isNull()) return; + + QFileInfo fi(qtVersion.toString()); + // should add all qt versions here ? + if (BuildableHelperLibrary::isQtChooser(fi)) + qtVersion = Utils::FileName::fromString(BuildableHelperLibrary::qtChooserToQmakePath(fi.symLinkTarget())); + BaseQtVersion *version = 0; foreach (BaseQtVersion *v, m_versions) { if (v->qmakeCommand() == qtVersion) { |