aboutsummaryrefslogtreecommitdiffstats
path: root/dist/installer
Commit message (Collapse)AuthorAgeFilesLines
* Remove outdated installer creation script and resourcesEike Ziller2017-12-0712-1090/+0
| | | | | | | | | | It is no longer used (it is using same scripts as Qt now), and contains outdated resources. Change-Id: I0576d694ef16ced49303dfc4d6075b742dbcc3b1 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Installer: Fix mimetypesOrgad Shaneh2016-11-241-1/+1
| | | | | | | They were changed in 05ef32f242154a46a40680e76f67e9888be687bd Change-Id: Ieeeaaf81fe308b2ecab214c9917fda5676a0de4e Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Ship qtdiag in binary packagesEike Ziller2016-09-151-0/+1
| | | | | | Task-number: QTCREATORBUG-16135 Change-Id: I29aabb697feaf6546c807263b037d70abc0cc5eb Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Installer: Support different display version than component versionEike Ziller2016-03-143-7/+7
| | | | | | | | | | | The component version must be numeric, but we want to display e.g. Qt Creator 4.0.0-beta1 in the installer title. The change adds a -d parameter to the script and adds corresponding replacement variables. Display version falls back to component version. Change-Id: Ia8bcd05444e280f8a44ab321b043f4031725600d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Update License according to aggrement with Free Qt FoundationTobias Hunger2016-01-185-706/+717
| | | | | | | | | * Update IFW files Change-Id: I8d715816df3ba420f1ba72ea997979303228a779 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* Fix deployment of qml2puppetEike Ziller2015-10-191-0/+4
| | | | | | | | | | | | The move to LIBEXEC_PATH broke running the puppet from the packages on Linux and OS X, because there it cannot find the platform plugin anymore. We need to add a qt.conf for it, and because Qt Creator.app/Contents/ Resources already contains the qt.conf for Qt Creator itself, the puppet must also move to its own subdirectory on OS X. Change-Id: I8e8cc48c49a01e10c7d7d3cc4c73020195cd5ca9 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Allow packaging additional 7zips in the installerEike Ziller2015-10-091-0/+9
| | | | | Change-Id: I435602671ef5cde46580d4ca383930951765ebde Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.5'Eike Ziller2015-09-043-2/+2
|\ | | | | | | Change-Id: Ife5fdcd71b0adc99d4297a28a64515e9e93d7864
| * Another try to fix that installer doesn't suggest start menu folder nameEike Ziller2015-09-033-2/+2
| | | | | | | | | | | | | | Change-Id: I584fe0ef595472144302252005d78ef66d8e0f99 Task-number: QTCREATORBUG-14674 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Merge remote-tracking branch 'origin/3.5'Eike Ziller2015-08-201-0/+1
|\| | | | | | | Change-Id: I65968dd02ea6bdd15f304ae567dd0c02238e6949
| * Windows: Fix that installer does not propose a start menu folderEike Ziller2015-08-171-0/+1
| | | | | | | | | | | | Change-Id: If1eeb38d2a023d5eb9b69ff85fefb992480c20f4 Task-number: QTCREATORBUG-14857 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Windows installer: Opening a project should open new Qt Creator instanceEike Ziller2015-08-201-2/+2
|/ | | | | | Task-number: QTCREATORBUG-14933 Change-Id: I241430e1772637409081522cad1079f05846ecee Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* Make sure all pages fit into installer wizard heightKai Koehne2015-06-303-0/+3
| | | | | | | | | Copy the hard-coded heights from the Qt installer. Otherwise the Qt Account page texts do not fit the default height, and the text is cut off at the bottom. Change-Id: I290a69ce6cbb57f4f63ff54728a9400253407ffb Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Fix installer config for IFW 2.0Eike Ziller2015-06-263-3/+3
| | | | | Change-Id: I6edbe34f311863019f6150bf0b2ce6400e836755 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Installer: Remove checks for bin\qmlviewer.exe, bin\linguist.exeKai Koehne2015-04-161-4/+1
| | | | | | | We don't package them anymore inside Qt Creator since years. Change-Id: Id624d5cb88960887a10feb0cc0188c786a4be187 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Installer: Install Visual Studio 2013 runtimeKai Koehne2015-03-111-2/+2
| | | | | Change-Id: I1664aa1b1f35c4d17b373cfc5b1468299dc51e3c Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Update LicenseEike Ziller2015-01-166-18/+28
| | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* OS X: Add background image to installer and update imagesEike Ziller2014-11-243-1/+1
| | | | | | | | | "Watermark" is not available on OS X We have a new logo now Task-number: QTCREATORBUG-13482 Change-Id: I01fdfb958bc67660a87a2c5a18f88613e7121aff Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-10-144-8/+183
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/ipaddresslineedit.cpp src/libs/utils/logging.h src/plugins/analyzerbase/AnalyzerBase.pluginspec.in src/plugins/android/Android.pluginspec.in src/plugins/android/androiddeploystep.cpp src/plugins/android/androiddeploystep.h src/plugins/android/androiddeploystepfactory.cpp src/plugins/android/androiddeploystepwidget.cpp src/plugins/android/androidpackagecreationfactory.cpp src/plugins/android/androidpackagecreationstep.cpp src/plugins/android/androidpackagecreationstep.h src/plugins/android/androidpackagecreationwidget.cpp src/plugins/android/androidpackagecreationwidget.h src/plugins/android/javafilewizard.cpp src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/baremetal/BareMetal.pluginspec.in src/plugins/bazaar/Bazaar.pluginspec.in src/plugins/beautifier/Beautifier.pluginspec.in src/plugins/bineditor/BinEditor.pluginspec.in src/plugins/bookmarks/Bookmarks.pluginspec.in src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in src/plugins/clangcodemodel/clanghighlightingsupport.cpp src/plugins/clangcodemodel/clangsymbolsearcher.cpp src/plugins/classview/ClassView.pluginspec.in src/plugins/clearcase/ClearCase.pluginspec.in src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp src/plugins/cmakeprojectmanager/cmakehighlighter.cpp src/plugins/coreplugin/Core.pluginspec.in src/plugins/cpaster/CodePaster.pluginspec.in src/plugins/cppeditor/CppEditor.pluginspec.in src/plugins/cppeditor/cppfilewizard.cpp src/plugins/cpptools/CppTools.pluginspec.in src/plugins/cpptools/cpphighlightingsupportinternal.cpp src/plugins/cpptools/cppmodelmanagerinterface.cpp src/plugins/cpptools/cppmodelmanagerinterface.h src/plugins/cvs/CVS.pluginspec.in src/plugins/debugger/Debugger.pluginspec.in src/plugins/designer/Designer.pluginspec.in src/plugins/diffeditor/DiffEditor.pluginspec.in src/plugins/emacskeys/EmacsKeys.pluginspec.in src/plugins/fakevim/FakeVim.pluginspec.in src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in src/plugins/git/Git.pluginspec.in src/plugins/git/gitorious/gitorious.cpp src/plugins/git/gitorious/gitorious.h src/plugins/git/gitorious/gitoriousclonewizard.cpp src/plugins/git/gitorious/gitorioushostwidget.cpp src/plugins/git/gitorious/gitorioushostwidget.h src/plugins/git/gitorious/gitorioushostwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwidget.cpp src/plugins/git/gitorious/gitoriousprojectwidget.h src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwizardpage.h src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp src/plugins/git/gitorious/gitoriousrepositorywizardpage.h src/plugins/glsleditor/GLSLEditor.pluginspec.in src/plugins/glsleditor/glsleditorfactory.cpp src/plugins/glsleditor/glslfilewizard.cpp src/plugins/helloworld/HelloWorld.pluginspec.in src/plugins/help/Help.pluginspec.in src/plugins/imageviewer/ImageViewer.pluginspec.in src/plugins/ios/Ios.pluginspec.in src/plugins/macros/Macros.pluginspec.in src/plugins/mercurial/Mercurial.pluginspec.in src/plugins/perforce/Perforce.pluginspec.in src/plugins/projectexplorer/ProjectExplorer.pluginspec.in src/plugins/pythoneditor/PythonEditor.pluginspec.in src/plugins/pythoneditor/pythoneditorwidget.cpp src/plugins/pythoneditor/wizard/pythonfilewizard.cpp src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in src/plugins/qmakeprojectmanager/profileeditorfactory.cpp src/plugins/qmldesigner/QmlDesigner.pluginspec.in src/plugins/qmljseditor/QmlJSEditor.pluginspec.in src/plugins/qmljseditor/qmljseditorfactory.cpp src/plugins/qmljstools/QmlJSTools.pluginspec.in src/plugins/qmlprofiler/QmlProfiler.pluginspec.in src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in src/plugins/qnx/Qnx.pluginspec.in src/plugins/qtsupport/QtSupport.pluginspec.in src/plugins/remotelinux/RemoteLinux.pluginspec.in src/plugins/resourceeditor/ResourceEditor.pluginspec.in src/plugins/resourceeditor/resourcewizard.h src/plugins/subversion/Subversion.pluginspec.in src/plugins/tasklist/TaskList.pluginspec.in src/plugins/texteditor/TextEditor.pluginspec.in src/plugins/texteditor/basetexteditor_p.h src/plugins/texteditor/basetextmark.cpp src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h src/plugins/texteditor/codeassist/defaultassistinterface.h src/plugins/texteditor/codeassist/iassistproposalitem.cpp src/plugins/texteditor/itexteditor.cpp src/plugins/texteditor/itexteditor.h src/plugins/texteditor/itextmark.cpp src/plugins/texteditor/plaintexteditor.cpp src/plugins/texteditor/plaintexteditor.h src/plugins/texteditor/texteditoractionhandler.cpp src/plugins/todo/Todo.pluginspec.in src/plugins/updateinfo/UpdateInfo.pluginspec.in src/plugins/valgrind/Valgrind.pluginspec.in src/plugins/vcsbase/VcsBase.pluginspec.in src/plugins/welcome/Welcome.pluginspec.in src/plugins/winrt/WinRt.pluginspec.in tests/auto/debugger/temporarydir.h Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
| * License updateEike Ziller2014-10-094-8/+183
| | | | | | | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | New Qt Creator logoAlessandro Portale2014-10-091-0/+0
|/ | | | | Change-Id: If00ef246081b72d4f5cc64efb529461c53fb0d23 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* OSX: Fix deployment of qml puppetsEike Ziller2014-08-221-4/+0
| | | | | | | They are no longer app bundles Change-Id: Ia2b9c62d478ae4ccacb20dc20eda44695d0fe960 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* packaging: fix qt.conf for ios toolsFawzi Mohamed2014-06-121-3/+0
| | | | | | | | | | | | Qt 5.3.1 does not set the profix only based on the use of QGuiApplication but actually checks if the app is a bundle, so the Prefix hack in the qt.conf for the ios tools is not needed anymore. Task-number: QTCREATORBUG-12393 Change-Id: I6a228d83370bc62929ffd056b9b3051e4562485e Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* install x86 vcredist only if it is necessaryTim Jenssen2013-12-031-1/+8
| | | | | | | Change-Id: I7d3b3aa35ceef3502c6b4250b60a572631a117be Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Fix hang at end of installation.Niels Weber2013-12-031-2/+3
| | | | | | | | Task-number: QTIFW-416 Task-number: QTCREATORBUG-10974 Change-Id: Ib2759cda2e24915880e134a13af126572094bd66 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Installer: Use right tag for specifying window iconEike Ziller2013-12-023-3/+3
| | | | | | | | | | Changed in IFW 1.4 Task-number: QTCREATORBUG-10010 Task-number: QTCREATORBUG-10243 Change-Id: I17ed5ee7bdf5fdc093351ac0c148eb5395fe699f Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Don't show checkbox for Creator if root on Linux and Mac.Niels Weber2013-11-191-2/+16
| | | | | | | Task-number: QTCREATORBUG-9491 Change-Id: Iae5025a311b72596a038424baa4cfb60149b1cdd Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Installer: remove unnecessary patch operationsTim Jenssen2013-11-141-13/+0
| | | | | | | | | Everything is done by the qt.conf mechanism Task-number: QTIFW-402 Task-number: QTCREATORBUG-10752 Change-Id: I003e7135d29c000a58e151cb9f913712d1110336 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* do not ignore exceptions at register file typeTim Jenssen2013-11-131-7/+3
| | | | | Change-Id: I935158e523549d55e58b4e4b7be0af2dac2058d6 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Installer: Fix shortcuts on WindowsKai Koehne2013-11-111-9/+9
| | | | | | | | | | Qt 5.2 changed behavior in that the '' characters won't be automatically stripped away for QCoreApplication::arguments(). Use "" instead, which is the windows default anyway. Task-number: QTCREATORBUG-10686 Change-Id: I21929feaf14845d4e8b1a67cff4560c199790295 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Register .qbs for Qt Creator standalone and fix icon for qmlEike Ziller2013-10-161-2/+9
| | | | | | Task-number: QTCREATORBUG-9150 Change-Id: I5cff954364b04e6cf1003697c7663b52c4a941db Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Ios: Move tools to <libexec>/ios, make them lowercase, fix deploymentEike Ziller2013-10-071-0/+5
| | | | | | | | They can't be directly in libexec path, because then they couldn't have their own qt.conf for resolving the Cocoa platform plugin. Change-Id: I8f3fae85c548747a7d826c078c7ac1fb0a836b43 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Fix deploying Qt on Mac (qt quick imports)Eike Ziller2013-09-261-0/+4
| | | | | | | | | | | Since we are using Qt Quick 2 now, Qt Creator also needs to find the Qt Quick 2 imports. Also make qmlpuppet (Qt Quick 1) optional for deploying Qt. Task-number: QTBUG-33545 Change-Id: I296e4b3a1827f7b26841e94e15eda718afef81d0 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Installer/Mac: Add missing config fileEike Ziller2013-06-201-0/+15
| | | | | Change-Id: Ib36e02b526ddd9501efcc3907ac69d6e2664f4ac Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Make it possible to build Qt Creator installers on Mac tooEike Ziller2013-06-191-1/+1
| | | | | Change-Id: Ic3e6f773cb0c2c41f83c6f8d54ed4e0151c69b40 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Installers: Use standard license agreement textsEike Ziller2013-06-192-16/+0
| | | | | | | | The way it was done is deprecated in IFW 1.3 and removed in 1.4, and there's no reason for us to use non-standard texts. Change-Id: I05ef4974a3f47bd8ffe0bb3b1a226adac48aa954 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* fix locked DMG after installing Qt OSX package and starting creatorTim Jenssen2013-06-181-1/+1
| | | | | | | | | - the workingdir was inside the dmg so it couldn't unmounted Task-number: QTBUG-28963 Change-Id: I183098108743d9cc0bd00fb6bfaa3e5755c08191 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Merge remote-tracking branch 'origin/2.7'Eike Ziller2013-04-301-1/+2
|\ | | | | | | | | | | | | Conflicts: src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104
| * Mac: Deploy and patch qml imports and qml2puppetEike Ziller2013-04-301-1/+2
| | | | | | | | | | | | | | | | | | | | The patching of imports and plugins is done automatically by macdeployqt, we need to pass it the qml2puppet executable though. Also add Qml2Imports to the qml(2)puppet's qt.conf. Task-number: QTCREATORBUG-9136 Change-Id: I9cb21d104f4c0c42531facfc6bc92fa9663e95a9 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | clean up installscript.qsTim Jenssen2013-03-251-33/+33
|/ | | | | | | | | This makes code sharing between the Qt SDK Qt Creator component and the standalone one much easier. Change-Id: I9573ef24054d88dcabfa89666703f6eada29140c Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* show LaunchQtCreatorCheckBox at the standalone installerTim Jenssen2013-03-133-0/+47
| | | | | | | | Some code was there but the ui file and the showing code was missing. Change-Id: I9a865ff7a10995d3b129e0b18c2f250bca852f9e Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* remove unsupported tag MaintenanceTitleTim Jenssen2013-03-052-2/+0
| | | | | | | | | Newer versions of the installer framework continue only with supported tags inside the installer config.xml file. Change-Id: I87c0e8f079023b5ba7cf7cca248e1fa310b7a97e Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* qmlpuppet: Point it to deployed Qt plugins as well.Eike Ziller2012-12-171-0/+1
| | | | | | | | | With Qt5 qmlpuppet needs to find a platform plugin. Task-number: QTCREATORBUG-8447 Change-Id: I701d17da7f68dfcdfaeda171e2421488462692eb Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Allow the user to choose to associate common file types.kh12012-12-073-1/+79
| | | | | | | | | | | Especially important if you already assigned the file types to a different application, or to keep defaults for VS users. Depends on: https://codereview.qt-project.org/#change,38650 Change-Id: I2b272c25e03bcc264ca73450fd26aa82ec30c296 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Make sure we register Creator with a proper ProgId.kh12012-11-301-17/+25
| | | | | | | Depends on: https://codereview.qt-project.org/#change,38650 Change-Id: Idbd91ec7873286fe4a371c6c9dcebddece4acf45 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Installer: Suppress error if newer version of vcredist is already installedEike Ziller2012-10-181-1/+1
| | | | | | | | Task-number: QTCREATORBUG-8076 Change-Id: Ia39491569fe696ec27c8375251ce6a0d5923dc1e Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Rename the (un)installers.Eike Ziller2012-10-161-1/+1
| | | | | | | | Windows has a problem with "install" in the name. Use .bin on Linux like before. Change-Id: I4f887a8c0442cd9f0a17425f68a36a371ae9f6b7 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Use same default installation directory as before.Eike Ziller2012-10-111-1/+1
| | | | | | | | Task-number: QTCREATORBUG-8009 Change-Id: I16135a0195cd068cb2feddbe0bc9ed2de5c31dba Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Robert Loehning <robert.loehning@digia.com>