feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
35,206 Commits 108 Branches 368 Tags
45361755f997a2a2714c95be73dda3900b51fd03
Commit Graph

35 Commits

Author SHA1 Message Date
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
c05e9d52b2 Ios: Move tools to <libexec>/ios, make them lowercase, fix deployment 
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>
 2013-10-07 15:32:10 +02:00
Eike Ziller
455d597ac3 Fix deploying Qt on Mac (qt quick imports) 
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>
 2013-09-26 15:43:37 +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
Eike Ziller
bedc477943 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp

Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104
 2013-04-30 11:43:33 +02:00
Eike Ziller
71f1919de9 Mac: Deploy and patch qml imports and qml2puppet 
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>
 2013-04-30 09:18:43 +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
Eike Ziller
175fbece76 qmlpuppet: Point it to deployed Qt plugins as well. 
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>
 2012-12-17 12:44:08 +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
Eike Ziller
d8a3b3a1e9 Mac/deployqt: Give qmlpuppet the correct qt.conf 
Change-Id: I73162205f8ed9978eeaca2a91e331d2e323b15ef
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2012-01-24 17:21:13 +01:00