feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
43,591 Commits 108 Branches 368 Tags
b13f964fd5403d15ece89f89f9823dd19a2bc459
Commit Graph

433 Commits

Author SHA1 Message Date
Eike Ziller
ee4f2557ca More changelog 
Change-Id: I7088ac84ae840c9e1dc83ff667938447406cc607
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-04-02 14:04:14 +02:00
Eike Ziller
cab8e4aa03 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/qtsupport/qtversionmanager.cpp
	src/shared/qbs

Change-Id: If7a93fb018799fe6ada76e79c24ab5b43dfa6fc2
 2014-04-02 13:24:34 +02:00
Orgad Shaneh
8398a306f4 Changelog: Add an entry for Git Show header change 
Change-Id: I6cdea03f2ebe372dfcd758f927a4adbcf3f96f60
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-04-01 12:03:43 +02:00
Niels Weber
a5132d38c0 Add appdata.xml file 
See http://people.freedesktop.org/~hughsient/appdata/

Change-Id: Idb30ddd17b80a0f606aa42f062b76905f11446b5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-04-01 12:03:13 +02:00
Orgad Shaneh
9edd15c2b8 ChangeLog: Add some more changes 
Change-Id: I51eb77abd8f6903408336a47396d54a7eda7331f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-03-04 11:34:21 +01:00
Eike Ziller
9df273ebe6 Update changes-3.1.0 
Change-Id: I81a3f5751be653c15ebef8efbbeaa716c2fdb390
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-03-03 17:00:20 +01:00
Tobias Hunger
354559aa71 CustomWizard: Use object pool to find factories 
Rename class type of CustomQmakeProjectWizard from "qt4project" to
"qmakeproject" and document that change in the manual and changes-3.1.0.

Also update all the in-tree xml files to that new class name.

Change-Id: I7a9ef914a429d68e7f37a2115c03fa81d7433398
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-02-17 11:00:58 +01:00
Orgad Shaneh
266e2b3b8b Dist/gdb: Upgrade to GDB 7.7 and libexpat 2.1.0 
Change-Id: I025c236dcd270cef52b8c1a3cc25eac55cdbc849
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-02-16 19:21:17 +01:00
Orgad Shaneh
f8b7b9849f Update changelog for 3.1.0 
Change-Id: I0919dbaeaf52504b342f7b5943dba6e1693be69a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-02-11 09:38:13 +01:00
Eike Ziller
b03a981a41 Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/shared/qbs

Change-Id: Ic6f115e3d9da32327cfe2d02d7356687dc3f60d7
 2014-02-11 09:14:22 +01:00
Eike Ziller
5d7e408121 Add changes file for 3.0.1 
Change-Id: I2be8c105fcde044b73f3f24be6db560f71524fe5
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-02-05 09:39:23 +01:00
Eike Ziller
b1eb376bfb More changes-3.1.0 
Change-Id: I9f1af9662df781dc2a89149f7229133f844e5f3b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-01-21 13:02:44 +01:00
Eike Ziller
851f255b9d Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
	src/plugins/qmlprofiler/qmlprofilertraceview.cpp

Change-Id: I778a0c2d0f1b4f799caaa2c2cc5daf94ec7ca352
 2014-01-15 14:04:41 +01:00
Eike Ziller
3330b695fa Add changes file for 3.1 
Change-Id: I4c1603d2cb8da8ae5e89781529277f9a5177ed3e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-01-14 11:07:20 +01:00
Eike Ziller
1d6a257597 More change log 
Change-Id: I608811fa480a94e0e3d65fbfb24d2425e7b4049d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-01-08 11:45:45 +01: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
Orgad Shaneh
53b1432e98 Doc: Fix link 
Change-Id: I6a6c4b12a81377879d5f6e00fd20def98924a41a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-12-13 09:43:08 +01:00
Orgad Shaneh
90dceec6e2 Changelog: Update VCS changes 
Mostly Git

Change-Id: Id4471cfd26ca7832aa081fb29495d4e6f020f7b8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-12-09 15:48:25 +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
Eike Ziller
7fdc8071fc Add changes file 
Change-Id: I68052cc83ffb1dac79b571990d85bcc3e17d6fb3
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-11-29 11:29:11 +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
hjk
e2d258842e Remove GDB patches 
The remaining patches are currently not actively used, and unlikely
to be used again in the future.

Change-Id: Ie2cc47d5076f5e28b8182c0ff06621f576c81d34
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Rainer Keller <rainer.keller@digia.com>
 2013-11-05 11:46:13 +01:00
Orgad Shaneh
c56a106dbe GDB: Remove datadir patch 
Lookup is done internally in the dumpers

Change-Id: Idc6a7bd7c47bb7e0655d10c21ac3e17421d98bdc
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-11-01 12:23:55 +01:00
Orgad Shaneh
a66f07344b Dist/gdb: Use eol=lf for patches 
Suppress patch warning on Windows

Change-Id: I2af2c45886dd2e095c1050f0ddc47bbdb3d40f86
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-11-01 09:47:41 +01:00
David Schulz
296eee6dc6 gdb: Adjust path to python artifacts in build script. 
Change-Id: I2d08d66d0f91a448e2a575387f34baaa8f91b560
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-10-31 15:26:48 +01:00
Orgad Shaneh
6da16dc824 Upgrade to GDB 7.6.1 
Change-Id: I9865d7d941719ddc228b6e4dea9abf0d702e3653
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-10-31 15:25:34 +01:00
Eike Ziller
8f00f261aa Merge origin/2.8 into 3.0 2013-10-22 11:34:20 +02: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
Viktor Ostashevskyi
2c46211967 Fix names spelling in the contributor list 
Change-Id: I057f0ae070e4b66628dd2ff64aa716dc2000f594
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Dmitry Savchenko <dmitry.a.sav@gmail.com>
Reviewed-by: Viktor Ostashevskyi <ostash@ostash.kiev.ua>
Reviewed-by: Andrey M. Tokarev <andrey.m.tokarev@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-10-15 16:41:36 +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
Kai Koehne
c3ed746c24 Mention also QML codemodel fix in changes-2.8.1 file 
Change-Id: I94c6a92cd27b6c0bd818b9d82240b20875909f07
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-08-23 12:27:18 +02:00
Kai Koehne
5f49e349e5 Update to changes-2.8.1 file 
Change-Id: I139fe7cd9e0ab4c11222bc388c9815dc2ffe8352
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-08-23 12:04:48 +02:00
Leena Miettinen
19bc8442c6 Add dist/changes-2.8.1 
Change-Id: If5ca031b927a81d68abb333604cdee4fa8d09f1c
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-08-20 16:39:36 +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
e7f9a209ea Change log fixes. 
Change-Id: I1edcf513d8d22dfc5abd87d0f339ea9d0b4015ca
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-05-30 14:41:56 +02:00
Eike Ziller
87bd3ead55 Add 2.8 changes file 
Change-Id: I47121fcce1c063a6a0af82ebac080f843d2d157f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-05-30 11:48:40 +02:00
David Schulz
ae3a25e05d GDB Makefile: added define for SOL_IPV6 
Added in the ipv6 patch.

Change-Id: I2d6257b9deb1f1fdec85dd89d799e69b04b1a462
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2013-05-02 08:05:23 +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
Christian Stenger
c77395d379 GDB: Fix Makefile for Linux 
Change-Id: I5e20bd4e335c1cd9e0ffeb07dd8fdf1f5d4747ac
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-04-29 12:57:01 +02:00
hjk
5a28377786 Debugger: Remove gdb-work-around-trk-single-step.patch 
Symbian is gone, and so is TRK.

Change-Id: I058e02d8990c5de0b9aa2f29ba7caebc30148f6d
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-04-11 08:04:04 +02:00