Commit 186f4115 authored by dt_'s avatar dt_ Committed by Daniel Teske

On editing qmake, start in a sane directory

Change-Id: I3d10946c50482bc8ec0e166bf6ea92bde2822f63
Task-Nr: QTCREATORBUG-5125
Reviewed-on: http://codereview.qt.nokia.com/453Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent 3f750695
......@@ -491,14 +491,14 @@ void QtOptionsPageWidget::removeQtDir()
void QtOptionsPageWidget::editPath()
{
// TODO Here be dragons
BaseQtVersion *current = currentVersion();
QString dir = QFileInfo(currentVersion()->qmakeCommand()).absolutePath();
QString qtVersion = QFileDialog::getOpenFileName(this,
tr("Select a qmake executable"),
QString(), filterForQmakeFileDialog());
dir, filterForQmakeFileDialog());
if (qtVersion.isNull())
return;
BaseQtVersion *version = QtVersionFactory::createQtVersionFromQMakePath(qtVersion);
BaseQtVersion *current = currentVersion();
// Same type? then replace!
if (current->type() != version->type()) {
// not the same type, error out
......
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