aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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-181-1/+1
| | | | | 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 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>
* 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>
* 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-031-5/+22
| | | | | | 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>
* 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>
* 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-231-1/+10
| | | | | | | | | | | | | | | | 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>
* 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>
* Use always black as the foreground color in HelpViewerThomas Hartmann2015-01-192-0/+2
| | | | | | | Our css styling assumes black as the background color. Task-number: QTCREATORBUG-13660 Change-Id: Ia8d76c39c970b436a0ae038191d8d0f8f8728ded Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Update LicenseEike Ziller2015-01-164300-25395/+25395
| | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* ProjectExplorer: Suggest Winphone and WinRT mkspecs...David Schulz2015-01-151-0/+5
| | | | | | | ... for MSVC 2013 toolchains. Change-Id: Idcf1aa523d819989091ddadeecdd26d07cfd2e8b Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* WinRT: Clean up target path for mapping fileMaurice Kalinowski2015-01-151-0/+2
| | | | | | | | | | The target inside the mapping file must not start with a slash. However one must specify a path value in the deployment rules, otherwise it will be ignored internally. Task-number: QTCREATORBUG-13835 Change-Id: Ic44cd6bc8c5fd7d48a3a980de566b492180c77fd Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* CodePaster: Fix pastebin.ca protocolChristian Stenger2015-01-131-1/+2
| | | | | | | | Actually this is circumventing the server side problem. Task-number: QTCREATORBUG-13802 Change-Id: I93fc9d0adde949a33c11be4cb73d8c28a75e3301 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* fix exclusion of qbs from tr()-collectionOswald Buddenhagen2015-01-091-1/+1
| | | | | | | | note that the TR_EXCLUDE is actually not used currently. Change-Id: Ifc89587029e2c025d1e0253794668a515127a43f Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Update qbs submodule.Christian Kandeler2015-01-091-0/+0
| | | | | | | To HEAD of 1.3 branch. Change-Id: I8abb74b0a037efc550c52a209dc11e2a6ee5e6d6 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* ClangCodeModel: Fix expression to find lib dir.David Schulz2015-01-091-1/+2
| | | | | Change-Id: I71362574d8437a7d95348c23eaf3698b7467b44d Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Fix OS X file drops from FinderEike Ziller2015-01-094-1/+84
| | | | | | | | | | This is a workaround for QTBUG-40449. Change-Id: I24a3bfb78d49e94dcafb99ee6d6b36ef4c4299c5 Task-number: QTBUG-40449 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* Fix a few memory leaksAki Koskinen2015-01-074-0/+8
| | | | | | | | | | Some raw pointers never got released. These errors were found by running QtCreator via Valgrind. Change-Id: I9c5b2862b98597f3e468d573e7126d7d9ec46b05 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Prevent using an invalidated referenceAki Koskinen2015-01-071-1/+2
| | | | | | | | | | | | | Inserting to a std::vector (possibly) invalidates all iterators and references for it. In this piece of code tok is a reference to a member in _tokens and it should not be used after an insertion is made to _tokens. Switched the order of two code lines to prevent this. Change-Id: Ia9d1ce66fc67406f56b426e7431402c6fe68a38f Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* Abi: Correctly set ABI information for the BSDs in hostAbi().Raphael Kubo da Costa2015-01-071-0/+10
| | | | | | | | | Add another #ifdef block for BSD operating systems so that qtcreator stops complaining that it does not have enough information about the host's ABI. Change-Id: I5841e162eda7f34fa4a962ab1c035d1727613f6f Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* CppTools: Check for valid active targetNikolai Kosjar2015-01-061-6/+12
| | | | | | | | | | The active target might be 0 if e.g. there are not kits and a project is imported. Task-number: QTCREATORBUG-13730 Change-Id: I48ade507fefc555d1d3f8230ba82c00270fa457b Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Theming: Use a lighter color for splitters in the dark themeOrgad Shaneh2015-01-061-1/+4
| | | | | | | | | This is a workaround for 3.3. In master the splitter color (among some other widgets) should have its own value. Task-number: QTCREATORBUG-13768 Change-Id: I8456fba3866e4857985e07a4708333952512484d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* ProjectExplorer: Add missing "return"s in MsvcToolChainOrgad Shaneh2015-01-051-4/+2
| | | | | | Change-Id: I62f830104fa9f3599a9e5ea85f404dd17c6ea38f Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* buildoutputparser: Respect $QTC_PREFIX.Raphael Kubo da Costa2015-01-051-1/+1
| | | | | | | | | Do what all other targets already do and take $$QTC_PREFIX into consideration when setting the target's installation path. Change-Id: I6ca87d36b345ec256518fe2d349e58d213f5c6d5 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* ClearCase: Fix not detecting that a file is already checked outKnut Petter Svendsen2015-01-051-0/+9
| | | | | | | | | | | ClearCase violates POSIX since it gives a file a new inode when checked out. This gives QtCreator problems with noticing that a file has changed permissions to writeable and thus it will insist on trying to check out the file again in some cases. Change-Id: Ia3f621daff258b3ea5d9ff4f5cec7629ca46e6bd Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* TextEditor: Adapt include guard to file renameOrgad Shaneh2015-01-051-3/+3
| | | | | Change-Id: I1a7c677bd0fcee19780dfab02472f081cc22ace7 Reviewed-by: hjk <hjk121@nokiamail.com>
* ClearCase: Set focus on Ok buttonKnut Petter Svendsen2015-01-031-0/+3
| | | | | Change-Id: I7d872f90bce914100c912db4c310001b8597b102 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Enforce prefixes "a/" and "b/" when doing git diffThiago Macieira2015-01-021-0/+1
| | | | | | | | | | The user can set different prefix using diff.mnemonicprefix or diff.noprefix (see git-config(1)), so we need to force them to the values that the diffeditor and PatchTool expect. Task-number: QTCREATORBUG-13782 Change-Id: I3110a34b2575b89abe840e040690f3f0c36e955b Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Update qbs submodule.Christian Kandeler2014-12-191-0/+0
| | | | | | | To HEAD of 1.3 branch. Change-Id: I66cd93f5a825319fb4c571eb6f77da7917fb7de0 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Adapt bugtracker URLEike Ziller2014-12-196-6/+6
| | | | | Change-Id: I93a256f18e720edb0bcfc2b409c119abfdcf2a2b Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 03:59:38 +0000