summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bump version3.3Kai Koehne2015-03-112-2/+2
| | | | | Change-Id: I286a88f3c767e8a6d5b213cc00d976449c2b3170 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Replace gitorious by code.qt.ioKai Koehne2015-03-101-1/+1
| | | | | Change-Id: I7926b8e0a7664a28540c86f26b9fa887a422fb16 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Add changes-3.3.2Eike Ziller2015-03-041-0/+15
| | | | | Change-Id: I660fe06a7949817c7516b9870dde264ee5d2088c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Doc: fix remaining links to Qt wiki in docsLeena Miettinen2015-03-045-28/+18
| | | | | Change-Id: Ia9193cf1870241104bf099ad2e47e3ead4eb43fd Reviewed-by: hjk <hjk@theqtcompany.com>
* Replace old qt-project.org wiki with wiki.qt.iov3.3.2Sergio Ahumada2015-03-0311-14/+14
| | | | | Change-Id: Ie7518d57b62e3f0b9dc6c559fe4a8f5b0212bb43 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* OS X: Make deployment of clang lib less fragile.Eike Ziller2015-02-271-1/+2
| | | | | | | | | Ensure that the correct rpath is added, even if we fail to remove the old one. Change-Id: I96e37d0e26b04f240300244aa93f434a60013410 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* QmlDesigner: Do not set QML_IMPORT_PATH for the fallback puppetThomas Hartmann2015-02-261-4/+8
| | | | | | | | | QML[2]_IMPORT_PATH does override the search path defined in the qt.conf. This means that defining QML_IMPORT_PATH does break the fallback puppet. Task-number: QTCREATORBUG-14031 Change-Id: I1441d18f7068df2b8068c70519507088ab41eed8 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Bump versionEike Ziller2015-02-252-2/+2
| | | | | Change-Id: I360a64f44258b7af6443db41163fd385102b2c60 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Update qbs submodule.Christian Kandeler2015-02-231-0/+0
| | | | | | | To HEAD of 1.3 branch. Change-Id: Ifce05da069397336b21081d797de07dcaf4d96fc Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Add changes-3.3.1v3.3.1Eike Ziller2015-02-191-0/+50
| | | | | Change-Id: I56d0e82f69e604aca3dc65940218ed471d203516 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* MSVC: Prioritize x86_arm cross compiler over x64_armOliver Wolff2015-02-181-1/+4
| | | | | | | | | | | Windows Phone and WinRT builds only support the x86_arm cross compiler. With this change this behavior is auto detected by Qt Creator for these builds (due to being higher prioritized). As soon as Windows Phone/WinRT builds support cross compilation from x64, this change can be reverted. Task-number: QTBUG-44530 Change-Id: I16ffe47c4582f51abdb6ef57b5922eb13863fd4e Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* Adapt documentation URLSergio Ahumada2015-02-1813-25/+25
| | | | | Change-Id: I74963a9d4a729450341f4f7a4ae5b3583654ffb8 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Do not expand display name when updating auto-detected Qt versionsKai Koehne2015-02-181-1/+1
| | | | | | | Task-number: QTCREATORBUG-13989 Change-Id: Id1e3d756f732b41e544f08ef74432002b7b8dc9f Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Update qbs submodule.Christian Kandeler2015-02-171-0/+0
| | | | | | | To HEAD of 1.3 branch. Change-Id: I4abd1fa5392794edb445cfd31a671570864438a6 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix TextEditor plugin compilationAlex Trotsenko2015-02-131-0/+2
| | | | | | | Declare classes before use them in QObject::connect(). Change-Id: Id9e8b6f753b303948e0d9d1dc9a29d9592bd6807 Reviewed-by: hjk <hjk@theqtcompany.com>
* Fix copyright headers in Python filesRobert Loehning2015-02-1389-89/+89
| | | | | Change-Id: Id2c60eae52d315b8b133512d978598d1bc187b43 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Fix theme loading problemSergey Belyashov2015-02-131-4/+7
| | | | | | | | | | | | | | | | | Error caused by any file named as current theme and placed to directory which is used for starting Qt Creator (formely user home directory). For example, create empty file with name 'default', place it to your home directory (for example: /home/user) and run Qt Creator. As result you will see black corrupted screen. To fix this bug I add checks of theme name. Now Qt Creator will only load theme from current directory if name is explicitly provided by the user or it is an absolute path. Change-Id: I0255c8d220d84bd5b51de7ef9d64c66f7f57959c Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Squish: Don't rely on progress bars when parsing qbs projectRobert Loehning2015-02-121-1/+6
| | | | | | Task-number: QBS-746 Change-Id: I316934884432953e2137d7e97b73fce352be4cac Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Update qbs submodule.Christian Kandeler2015-02-121-0/+0
| | | | | | | To HEAD of 1.3 branch. Change-Id: I1b900208dd52978ae0a7cf0a79e2469cfc6928f0 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Squish: Remove outdated codeRobert Loehning2015-02-121-3/+0
| | | | | Change-Id: I765374645bb6176028416e7ad8e4ce69df65723d Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Squish: Prepare help tests for Qt 5.4Robert Loehning2015-02-113-2/+13
| | | | | Change-Id: I38568b325ae37d8b75ad3481ef0cc6ced0a99488 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Android: Fix debugging applications that link many modulesEskil Abrahamsen Blomfeldt2015-02-111-8/+0
| | | | | | | | | | | | | | | | | When debugging an application we will add a few arguments to the command line for launching the application. We would do the same for every library etc. required by the modules linked to the application. At some point, the command line would become too long and fail to execute. Passing the libraries, libs_prefix, etc. on the command line is not necessary, since the parameters are already included in the AndroidManifest.xml, otherwise it would not be possible to launch the application from the device itself. Change-Id: I93a7f64a4ce32ebb2b25c54b0d17ae2b23706e24 Task-number: QTCREATORBUG-13691 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* Theming: Fix highlighting of focused widget in target selectorOrgad Shaneh2015-02-102-4/+5
| | | | | Change-Id: I477a409ed231a291fb9320ce9014853a7e21274c Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* Update qbs submodule.Christian Kandeler2015-02-061-0/+0
| | | | | | | To HEAD of 1.3 branch. Change-Id: I5409cd497e2380a5c1ea78e4c5de8e5d28fab97b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* V8Debugger: Remove unused memberKai Koehne2015-02-041-1/+0
| | | | | Change-Id: Ieaea81203cad0170d638dcee8b91b73bb3bc7144 Reviewed-by: hjk <hjk@theqtcompany.com>
* QbsPM: Remove existing qbs profile before recreating from kit.Christian Kandeler2015-02-031-0/+1
| | | | | | | | Otherwise, "remove" operations on a kit such as clearing out the sysroot or removing the Qt version will leave the old entries in the profile. Change-Id: I70be926472c8d290b80e3479fc49286113f71380 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* C++: Fix crash when #if[def] nesting is deeper than 512 levelsOrgad Shaneh2015-02-032-5/+40
| | | | | | Change-Id: I5e86da3a36514545834f554470b147ad8be43344 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* Editor: Fix crash in generic highlighter.David Schulz2015-02-021-3/+4
| | | | | | | | Make sure that the progress data object is deleted before the rule. Task-number: QTCREATORBUG-13883 Change-Id: Ie0d1825e695f0bfa7d46ee6dd807a94c95a08cd7 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Squish: Stabilize tst_qml_editorRobert Loehning2015-02-021-1/+4
| | | | | | | Avoid false fails with Squish 5.1.3 and Qt 5.4.0 on Windows Change-Id: I4d330627ed7d93ad7e327aebd9c9d3173e34a8e1 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* V8Debugger: Don't send watcher requests if qml engine has not stoppedKai Koehne2015-02-021-0/+3
| | | | | | | | | | This fixes a regression introduced in a8ebf535b829dac. We shouldn't send watcher evaluation commands while the QML engine hasn't actually stopped, because this might lead to an assert on the server side. Task-number: QTCREATORBUG-13916 Change-Id: I300e2f73c0a1a03e0e6187a5357abeba408f72a0 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Disable broken debugger tooltips for QMLKai Koehne2015-01-301-1/+1
| | | | | | | | | | Looks like the proper handling of tooltips while debugging a QML app is broken since commit 7f09d0b756ff3f9 . Just disable the functionality for now. Task-number: QTCREATORBUG-13854 Change-Id: I346058f6f9753475ec209ec8befdd5425bbd83d0 Reviewed-by: hjk <hjk@theqtcompany.com>
* Doc: fix bug in doc building instructionsLeena Miettinen2015-01-291-3/+6
| | | | | | | And add a note about the new online style. Change-Id: I4d16ea45dd121a27c5c8d8c0fe5e5b971f8c2d05 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Tests: Fix offsets test for Qt5.4Christian Stenger2015-01-291-1/+11
| | | | | Change-Id: I1517bfbde852af5db7088fa21b33a27e20f2db61 Reviewed-by: hjk <hjk@theqtcompany.com>
* Update qbs submodule.Christian Kandeler2015-01-281-0/+0
| | | | | | | To HEAD of 1.3 branch. Change-Id: I1ec44fb51dc18bb9e72e10c1c5811ef52ffdc363 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Update qbs submodule.Christian Kandeler2015-01-231-0/+0
| | | | | | | To HEAD of 1.3 branch. Change-Id: Id9c9635edeec3a3bff145087f5e296f1141fc202 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Set QML[2]_IMPORT_PATH evn variable when running qml[2]puppetBogDan Vatra2015-01-233-20/+29
| | | | | | | | qml[2]puppet can't use any QML plugin that are defined in your .pro file (using QML_IMPORT_PATH) unless we don't specify it. Change-Id: I0fffb8a5da1023565fa9fce5cd4cf38f098a0df1 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* C++: Check for cycled parentsNikolai Kosjar2015-01-232-28/+86
| | | | | | | | | | | | | | | | In the struct _Wrap_alloc (see test code) the rebind struct has _Wrap_alloc as parent. However, within rebind the typedef of type _Wrap_alloc has rebind as parent. We will refactor that in master by introducing a "parent iterator" class checking for cycles, so the client code looks less noisy. Task-number: QTCREATORBUG-13703 Change-Id: I7b6cf819ea869139d2403e15ba085d8fba19763e Reviewed-by: Cristian Adam <cristian.adam@gmail.com> Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* Sort the possible import list.BogDan Vatra2015-01-232-28/+29
| | | | | Change-Id: Iaa77273ebaf0867119f06c6ee3c2d29a61168933 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Fix for import managementThomas Hartmann2015-01-231-0/+3
| | | | | | | | | | | | If we add a new import we have to scan for new item library entries in the directory belonging to the import. Without this patch e.g. the commercial controls were not added to the item library. The user had to switch to edit mode and back to trigger and update. Change-Id: Ie145aea53fbd57ffac976725b6c1fd5553ddf22e Reviewed-by: BogDan Vatra <bogdan@kde.org>
* qmljs: do not rely on future.isCanceled to be stickyFawzi Mohamed2015-01-221-2/+4
| | | | | | Change-Id: I92f32b9cbea1ddb1660895264f853068c31af4cd Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* KitConfigWidget: Only emit autodetectionChanged if itactually changedDaniel Teske2015-01-221-1/+2
| | | | | | | Ups. I verified that the crash is still fixed. Change-Id: Ibb3a72bab79eb433ff426c90a60b33cc6a6d873b Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* QmlDesigner.PropertyEditor: Remove Slider from SpinBoxThomas Hartmann2015-01-222-92/+0
| | | | | | | | | | The integrated slider in a SpinBox did not work well. Sliders do crash on Yosemite if maximumValue and minimumValue are the same. Change-Id: If1a5fe5109591bc8198c5659f10e73ebaeb8c636 Task-number: QTCREATORBUG-13842 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* QmlDesigner.PropertyEditor: Fix minimum value of PathView dragMarginThomas Hartmann2015-01-221-1/+1
| | | | | Change-Id: I597ebdef0797a3184b9480215b85b59797aa59d8 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* QmlDesigner.PropertyEditor: Increase maximum SpinBox sizeThomas Hartmann2015-01-221-1/+1
| | | | | | | This fixes glitches for numbers > 9999. Change-Id: Ib49ff4c3a8da3caaf19b713fa309563349e48501 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* Squish: Disable pastebin.ca for now.Robert Loehning2015-01-211-1/+1
| | | | | | | "Server is at capacity" Change-Id: I440dca1e2d6bfab13b2fe59662691df4fa724ba7 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Debugger: Fix scoping bug in watch handler.Christian Kandeler2015-01-211-1/+1
| | | | | | | Found by clang static analyzer. Change-Id: Ib25232b26c314d4da4707f7903f1b75b907b241d Reviewed-by: hjk <hjk@theqtcompany.com>
* Kit: Fix crash on removing android kits that were autodetectedDaniel Teske2015-01-205-1/+40
| | | | | | | | | | | | | | | | | | | | | To reproduce: In the Android settings, enabled "Automatically create kits" -> This creates kits with autodetected set to true Switch to the kits page to get the KitPage filled, those kits now appear under the autodetected node. Switch to the Android settings and disable "Automatically create kits", -> This doesn't want to delete the old kits, to not throw away user settings, so the kits are marked as manual by calling setAutoDetected Switch to the Kit page and notice the kits still listed under the autodetected node. Clicking apply enables the remove button and on removing Creator crashes. Add the necessary signal emissions to setAutoDetected and several other methods and fix the KitModel to cope with changes to autodetected. Task-number: QTCREATORBUG-13736 Change-Id: I3d0ff247a6bfff8ace53df8535749db5c736d54b Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Utils: Remove outdated warnings exclusions on MSVCOrgad Shaneh2015-01-201-5/+0
| | | | | | Change-Id: I89d440f4ba781f4b2e5f9cbf84cc638a56a743dc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* WinRT: Fix occasional crash when debugging WinRT application.David Schulz2015-01-203-1/+7
| | | | | Change-Id: Ie7d54e49d67450395bf6161e9b71d00a9bf52e23 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* Doc: Mention limitation for .ui.qml files in the Open Source version.Thomas Hartmann2015-01-191-0/+3
| | | | | Change-Id: I8b4e4853072dccb95d3313837e6fa83e7bb76021 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
View Lorry Controller Status