Commit 8624b3e1 authored by Eike Ziller's avatar Eike Ziller

Don't resolve symlinks in browser for qmake executable.

On Mac, the Qt packages install qmake to "/usr/bin/qmake-4.7" etc, and
put a symlink "qmake" in a browsable place. If the browser resolves
symlinks, we would need to accept all these different qmake naming variants
instead of just "qmake". Also, there is no reason for resolving the symlink,
in the worst case (like in this case) it just makes life harder.

Task-number: QTCREATORBUG-6222
Change-Id: I973a648ea2d1586075723efa6164f44d8fd3ecad
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent 3a1ae4e1
......@@ -596,7 +596,9 @@ void QtOptionsPageWidget::addQtDir()
QFileDialog::getOpenFileName(this,
tr("Select a qmake executable"),
QString(),
filterForQmakeFileDialog()));
filterForQmakeFileDialog(),
0,
QFileDialog::DontResolveSymlinks));
if (qtVersion.isNull())
return;
if (QtVersionManager::instance()->qtVersionForQMakeBinary(qtVersion)) {
......@@ -642,7 +644,10 @@ void QtOptionsPageWidget::editPath()
Utils::FileName qtVersion = Utils::FileName::fromString(
QFileDialog::getOpenFileName(this,
tr("Select a qmake executable"),
dir, filterForQmakeFileDialog()));
dir,
filterForQmakeFileDialog(),
0,
QFileDialog::DontResolveSymlinks));
if (qtVersion.isNull())
return;
BaseQtVersion *version = QtVersionFactory::createQtVersionFromQMakePath(qtVersion);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment