feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
50,929 Commits 108 Branches 368 Tags
3b901b25a86f49ebef9be03ec762ed76422fd91c
Commit Graph

47 Commits

Author SHA1 Message Date
Orgad Shaneh
89ce80037c Installer: Fix mimetypes 
They were changed in 05ef32f242

Change-Id: Ieeeaaf81fe308b2ecab214c9917fda5676a0de4e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2016-11-24 10:06:56 +00:00
Eike Ziller
db61acce80 Installer: Support different display version than component version 
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>
 2016-03-14 13:18:22 +00:00
Tobias Hunger
8c6b31f3d8 Update License according to aggrement with Free Qt Foundation 
* 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>
 2016-01-18 09:05:24 +00:00
Eike Ziller
57ae75061d Allow packaging additional 7zips in the installer 
Change-Id: I435602671ef5cde46580d4ca383930951765ebde
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2015-10-09 11:33:21 +00:00
Eike Ziller
c868b9f3ed Merge remote-tracking branch 'origin/3.5' 
Change-Id: Ife5fdcd71b0adc99d4297a28a64515e9e93d7864
 2015-09-04 09:19:28 +02:00
Eike Ziller
2186d0815a Another try to fix that installer doesn't suggest start menu folder name 
Change-Id: I584fe0ef595472144302252005d78ef66d8e0f99
Task-number: QTCREATORBUG-14674
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-09-03 13:12:29 +00:00
Eike Ziller
8eaaef96aa Merge remote-tracking branch 'origin/3.5' 
Change-Id: I65968dd02ea6bdd15f304ae567dd0c02238e6949
 2015-08-20 13:23:13 +02:00
Eike Ziller
9c27b9fd5f Windows installer: Opening a project should open new Qt Creator instance 
Task-number: QTCREATORBUG-14933
Change-Id: I241430e1772637409081522cad1079f05846ecee
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
 2015-08-20 08:20:11 +00:00
Eike Ziller
d8662f7a5a Windows: Fix that installer does not propose a start menu folder 
Change-Id: If1eeb38d2a023d5eb9b69ff85fefb992480c20f4
Task-number: QTCREATORBUG-14857
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2015-08-17 13:28:48 +00:00
Kai Koehne
ccb930e292 Make sure all pages fit into installer wizard height 
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>
 2015-06-30 06:55:15 +00:00
Eike Ziller
eeb77ee827 Fix installer config for IFW 2.0 
Change-Id: I6edbe34f311863019f6150bf0b2ce6400e836755
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2015-06-26 12:25:33 +00:00
Kai Koehne
8c4624951a Installer: Remove checks for bin\qmlviewer.exe, bin\linguist.exe 
We don't package them anymore inside Qt Creator since years.

Change-Id: Id624d5cb88960887a10feb0cc0188c786a4be187
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-04-16 14:23:56 +00:00
Kai Koehne
63cc0b052a Installer: Install Visual Studio 2013 runtime 
Change-Id: I1664aa1b1f35c4d17b373cfc5b1468299dc51e3c
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-03-11 10:04:38 +00:00
Eike Ziller
3c85058694 Update License 
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2015-01-16 12:37:56 +01:00
Eike Ziller
c4971b6eff OS X: Add background image to installer and update images 
"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>
 2014-11-24 09:03:15 +01:00
Eike Ziller
ea27143239 Merge remote-tracking branch 'origin/3.2' 
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
 2014-10-14 15:36:16 +02:00
Alessandro Portale
b1176b97dd New Qt Creator logo 
Change-Id: If00ef246081b72d4f5cc64efb529461c53fb0d23
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-10-09 15:43:28 +02:00
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02:00
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +01:00
Tim Jenssen
62fed3c407 install x86 vcredist only if it is necessary 
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>
 2013-12-03 10:36:51 +01:00
Niels Weber
9e2caea36f Fix hang at end of installation. 
Task-number: QTIFW-416
Task-number: QTCREATORBUG-10974

Change-Id: Ib2759cda2e24915880e134a13af126572094bd66
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-12-03 10:29:55 +01:00
Eike Ziller
ea64a75a8d Installer: Use right tag for specifying window icon 
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>
 2013-12-02 14:18:23 +01:00
Niels Weber
b0ca7d129f Don't show checkbox for Creator if root on Linux and Mac. 
Task-number: QTCREATORBUG-9491

Change-Id: Iae5025a311b72596a038424baa4cfb60149b1cdd
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-11-19 10:33:46 +01:00
Tim Jenssen
d7f7701394 Installer: remove unnecessary patch operations 
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>
 2013-11-14 11:10:29 +01:00
Tim Jenssen
16bacb8c85 do not ignore exceptions at register file type 
Change-Id: I935158e523549d55e58b4e4b7be0af2dac2058d6
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-11-13 14:09:07 +01:00
Kai Koehne
7e869bfa7f Installer: Fix shortcuts on Windows 
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>
 2013-11-11 14:46:07 +01:00
Eike Ziller
b11937682f Register .qbs for Qt Creator standalone and fix icon for qml 
Task-number: QTCREATORBUG-9150
Change-Id: I5cff954364b04e6cf1003697c7663b52c4a941db
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-10-16 15:14:21 +02:00
Eike Ziller
5c4a1a1263 Installer/Mac: Add missing config file 
Change-Id: Ib36e02b526ddd9501efcc3907ac69d6e2664f4ac
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-06-20 10:29:31 +02:00
Eike Ziller
4babcabf20 Make it possible to build Qt Creator installers on Mac too 
Change-Id: Ic3e6f773cb0c2c41f83c6f8d54ed4e0151c69b40
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-06-19 18:42:23 +02:00
Eike Ziller
1ef2e51cf8 Installers: Use standard license agreement texts 
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>
 2013-06-19 11:06:33 +02:00
Tim Jenssen
677b3104e9 fix locked DMG after installing Qt OSX package and starting creator 
- 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>
 2013-06-18 15:51:15 +02:00
Tim Jenssen
ec10e0d79e clean up installscript.qs 
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>
 2013-03-25 21:36:35 +01:00
Tim Jenssen
54614b03b8 show LaunchQtCreatorCheckBox at the standalone installer 
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>
 2013-03-13 11:03:25 +01:00
Tim Jenssen
2e44967997 remove unsupported tag MaintenanceTitle 
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>
 2013-03-05 10:45:42 +01:00
Robert Loehning
298531e370 Incremented year in copyright info 
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-01-29 16:27:03 +01:00
kh1
b8a26af434 Allow the user to choose to associate common file types. 
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>
 2012-12-07 15:29:54 +01:00
kh1
164b45c82e Make sure we register Creator with a proper ProgId. 
Depends on: https://codereview.qt-project.org/#change,38650

Change-Id: Idbd91ec7873286fe4a371c6c9dcebddece4acf45
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2012-11-30 13:09:20 +01:00
Eike Ziller
c89ffbe3ce Installer: Suppress error if newer version of vcredist is already installed 
Task-number: QTCREATORBUG-8076

Change-Id: Ia39491569fe696ec27c8375251ce6a0d5923dc1e
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2012-10-18 13:16:36 +02:00
Eike Ziller
69f8e48de4 Rename the (un)installers. 
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>
 2012-10-16 14:04:05 +02:00
Eike Ziller
f048e6f48e Use same default installation directory as before. 
Task-number: QTCREATORBUG-8009

Change-Id: I16135a0195cd068cb2feddbe0bc9ed2de5c31dba
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2012-10-11 14:06:59 +02:00
tjenssen
1d5e17457d disable component selection page 
Change-Id: I652fedc0094deb8c4c1d1f18ca9551f5c2a582dc
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-11 10:46:15 +02:00
tjenssen
fa9e8755cb add norestart to vcredist installation command 
Change-Id: Id563ef4f7e696e6b3f9474852de5e55936e02bce
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-11 10:46:05 +02:00
Eike Ziller
f3d30dfba1 Fix installation directory and add version to title. 
Task-number: QTCREATORBUG-7991

Change-Id: I4874527fc07040dea803bf50e1e4c335d9eb6810
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2012-10-10 09:11:47 +02:00
Eike Ziller
da2ae22036 Install VS redistributable on Windows. 
Change-Id: I0669ae1e2aacb0088af8619c19a54a16fa568ea3
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2012-10-08 18:12:16 +02:00
hjk
386ca7c8dd Adjust license headers 
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 17:12:56 +02:00
Eike Ziller
1589df13e6 Remove special characters from installer license 
Task-number: QTCREATORBUG-7954

Change-Id: Ib188f80994ceea252bba02d1e6ac2b0f32a84157
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 15:22:20 +02:00
Eike Ziller
154f6c859e Add installer target. 
Requires Qt Installer Framwork (IFW)

Change-Id: Id78c05f86cc104d29d4ed3ba02baefa20d49fe4f
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2012-09-28 09:35:08 +02:00