diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-21 14:42:42 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-21 16:05:04 +0200 |
| commit | 0ecb1abd97fd254ec0a7f8b461ca6ca546c6563b (patch) | |
| tree | e31ccf34e7d58b126c053f6f1d7ee16c0d4d823a /dist | |
| parent | ee996a6620ecada0068804b236cf24e2ffef37ea (diff) | |
| download | qtenginio-0ecb1abd97fd254ec0a7f8b461ca6ca546c6563b.tar.gz | |
Let the user select qmake when running the installer
Change-Id: I67e85dea765bb48d7f8ba8e75b5e01814d312ef5
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/packages/com.digia.enginio/meta/installscript.qs | 11 | ||||
| -rw-r--r-- | dist/packages/com.digia.enginio/meta/qtselection.ui | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/dist/packages/com.digia.enginio/meta/installscript.qs b/dist/packages/com.digia.enginio/meta/installscript.qs index fb14207..e389538 100644 --- a/dist/packages/com.digia.enginio/meta/installscript.qs +++ b/dist/packages/com.digia.enginio/meta/installscript.qs @@ -53,7 +53,7 @@ checkQmakePath = function() try { qtpath = component.userInterface("QtSelectionPage").qmakePathLineEdit.text; if (installer.fileExists(qtpath)) { - if (installer.fileExists(qtpath + "/bin/qmake.exe") || installer.fileExists(qtpath + "/bin/qmake")) { + if (installer.fileExists(qtpath)) { component.userInterface("QtSelectionPage").complete = true; return; } @@ -68,12 +68,12 @@ showFileDialog = function() { try { if (installer.value("os") == "win") { - path = QFileDialog.getExistingDirectory("Select Qt path (the directory containing bin\\qmake.exe)", "c:\\qt\\"); + path = QFileDialog.getOpenFileName("Select qmake.exe (in the bin directory of your Qt installation)", "c:\\qt\\", "qmake (qmake.exe)"); path = path.replace(/\//g, "\\"); component.userInterface("QtSelectionPage").qmakePathLineEdit.text = path; } else { // FIXME on linux the prefixes might be different (bin/lib etc in different places) - path = QFileDialog.getExistingDirectory("Select qt path", ""); + path = QFileDialog.getOpenFileName("Select qmake (in the bin directory of your Qt installation)", "", "qmake (qmake)"); component.userInterface("QtSelectionPage").qmakePathLineEdit.text = path; } } catch (e) { @@ -84,7 +84,10 @@ showFileDialog = function() Component.prototype.createOperationsForArchive = function(archive) { if (component.name === "com.digia.enginio") { - component.addOperation("Extract", archive, component.userInterface("QtSelectionPage").qmakePathLineEdit.text); + path = component.userInterface("QtSelectionPage").qmakePathLineEdit.text; + // remove bin/qmake* from path + path = path.replace(/bin.*/, ""); + component.addOperation("Extract", archive, path); } else { component.addOperation("Extract", archive, "@TargetDir@"); } diff --git a/dist/packages/com.digia.enginio/meta/qtselection.ui b/dist/packages/com.digia.enginio/meta/qtselection.ui index aa36d2f..94f4324 100644 --- a/dist/packages/com.digia.enginio/meta/qtselection.ui +++ b/dist/packages/com.digia.enginio/meta/qtselection.ui @@ -18,7 +18,7 @@ <widget class="QLabel" name="label"> <property name="text"> <string>Enginio needs to install some files next to your Qt installation. -Please select the folder of the Qt 5 version you would like to use with Enginio.</string> +Please select qmake (in the bin directory of your Qt installation) of the Qt 5 version you would like to use with Enginio.</string> </property> <property name="wordWrap"> <bool>true</bool> |