summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Compile fix for Qt 5.94.1hjk2017-09-042-2/+2
| | | | | | | | | | | | This here is a trivial backport of 991f5eb6a5699 which doesn't apply cleanly due to renamings in that area. It is meant to help regression testing Qt Creator over a wider range of versions bridging the source compatibility breakage in change 821390b7c3a9438 in Qt Core. Change-Id: Ib6d06927dbe16f94b21caca0993f524b282f167a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Update qbs submoduleChristian Kandeler2016-11-141-0/+0
| | | | | | | To HEAD of 1.6 branch. Change-Id: I311ae7c1e1523bdda86efd3c92149261f8d69129 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Qbs: filter out -arch compiler flags from platformCompiler/LinkerFlagsJake Petroules2016-11-141-2/+21
| | | | | | | | | | -arch is not allowed in compiler flags as it's automatically handled by the qbs.architecture property, and is an error in current versions of Qbs. If the architecture was successfully detected, remove the flags. Change-Id: I85cce7b7f4ef5a92f857ec624a912861bcb267f5 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* QbsProjectManager: Fix compile with gcc 4.8Christian Stenger2016-11-141-1/+1
| | | | | Change-Id: I3be0349c9af1f8ed51f04c04ce97983409dd7512 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add missing change log entriesEike Ziller2016-11-111-0/+10
| | | | | Change-Id: I57a8792cc6dc9c03f682f6cd98ac640c6559e828 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Qbs: don't set cpp.linkerNameJake Petroules2016-11-112-5/+0
| | | | | | | | | This is unnecessary (and counterproductive) with automatic linker mode in Qbs 1.6. Change-Id: I808effead885eeba0d524fa27989b8a54b8c655f Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Qbs: fix Xcode SDK detection (take 2)Jake Petroules2016-11-111-20/+36
| | | | | | | | | | | | | This adds xcode to the toolchain list, which is required to load the Xcode module. It also uses the compiler path as the mechanism to find the developer path, and then extracts the canonical SDK name using the sysroot if it's a valid one for the previously extracted developer path. amends d121fefaa9631fa482bca534cf3d8d0f15b5ffc3 Change-Id: I73cf1a50acd6b99a9fc3b6003bcc6dc23c2a04ab Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* QbsProjectManager: Fix missing includeChristian Stenger2016-11-111-0/+1
| | | | | | | | | Avoid compile issue when using gcc 4.8. (error: variable 'const QRegularExpression re' has initializer but incomplete type) Change-Id: Ic89f9afdf0a6854948a21103a64ec8b8f4ad1681 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Qbs: fix Xcode SDK detectionJake Petroules2016-11-102-16/+16
| | | | | | | | | | The Xcode related properties in the cpp module no longer exist. Use the correct ones, and be a little stricter about extracting the constituent components from the sysroot. Change-Id: I6ceaebf529764e69e1e04af6650a2920b139fac2 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Update qbs submoduleChristian Kandeler2016-11-081-0/+0
| | | | | | | To HEAD of 1.6 branch. Change-Id: Ia1ef808a80e36529cb81167acb8d3109f5f058ea Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix QnxDebugSupport::startExecution()Ulf Hermann2016-11-031-8/+9
| | | | | | | | | | | | | | | | | | Under the assumption that the QNX debug support should work similar to the RemoteLinux debug support we have to: a, use the Runnable provided with the run control b, not recycle the arguments from the run control start parameters c, prepend a new set of QML debugger arguments when QML debugging There seems to be some mechanism that allows us to do C++ debugging by simply starting a process "pdebug <n>" for some port number <n> on the target. We don't touch this here. Task-number: QTCREATORBUG-17208 Change-Id: I0f4541968e1d20940617e8ff6d16a8ad86ea22c9 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Fix CDB detectionRafael Roquetto2016-10-311-3/+3
| | | | | | | | | | | | | | | To make sure CDB is really installed on a Windows Kit, we need to assure the 'inc' subdirectory is present. Before this patch, if, for instance, the Windows 8.1 kit is present (including a Debuggers subdirectory), but without CDB, the first test under "32-bit" qmake will yield a false positive, preventing the following 32-bit kits to be tested, then to fail under the 64-bit qmake test because the 'inc' directory is inexistent, finally bringing about an empty CDB_PATH variable. Change-Id: I1d7cf3350f4a63a556ef106faa5b3f0593dcf8c8 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com> Reviewed-by: Brett Stottlemyer <bstottle@ford.com> Reviewed-by: David Schulz <david.schulz@qt.io>
* Update qbs submoduleChristian Kandeler2016-10-281-0/+0
| | | | | | | To HEAD of 1.6 branch. Change-Id: Ideda150d8126e09fa105b3b85848f7af102a29d4 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Source packages: Fix that tar.xz was not xz but gzEike Ziller2016-10-281-1/+1
| | | | | Change-Id: I5379cdfe963f53cca04317ea51f544c40743db7b Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Remove the qt keyword from CONFIGAndy Shaw2016-10-241-1/+1
| | | | | | | | | This is already implicitly included, however since the placement of it can interfere with the qtquickcompiler, it should be removed. Change-Id: I270fa0093ad8a7739f4f25bbef477560003e2d01 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Update Russian translationSergey Belyashov2016-10-241-8/+40
| | | | | | Change-Id: I1353d68a2a07a031446ebe2b2ae4eb45f07f06e3 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Remove deployment of iossim toolVikas Pachdha2016-10-201-2/+0
| | | | | | | iossim tool no longer exists and it is replaced by Xcode's simctl tool Change-Id: I4f4dbdc8b8e91663109c289b75a21dd92d966018 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Revert "iOS: Replaced deprecated signal QProcess::error. Fixes compilation ↵Christian Stenger2016-10-181-2/+4
| | | | | | | | | | | issues with GCC" This reverts commit a9f00a2da3d71fd365e93141527cfb755b8de75b as this commit uses functions that are available from Qt5.6 onwards but we still have Qt5.5 as minimum requirement. Change-Id: Ice16d4faeb3417dc80431299b308b37ab2b56c1f Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Fix qbs buildChristian Kandeler2016-10-181-1/+0
| | | | | Change-Id: Ia3f0d8b65d0ac1d081934540e4fb04f5b5216b6f Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* iOS: Fix build with namespaced QtChristian Kandeler2016-10-181-0/+2
| | | | | Change-Id: I09f07ed853e0c9fba8b856d1851b5994f4318945 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Update Russian translationSergey Belyashov2016-10-171-1133/+2186
| | | | | | Change-Id: I898b6166959db375273376e484aeb9956550142d Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* iOS: Replaced deprecated signal QProcess::error. Fixes compilation issues ↵Vikas Pachdha2016-10-171-4/+2
| | | | | | | with GCC Change-Id: I4945b345032023c3c2e8d1fa7f51dadbbb0bc9d9 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* iOS: Removed ios_sim tool source. simctl is used for app deployment on iOS ↵Vikas Pachdha2016-10-1728-3145/+0
| | | | | | | | Simulator Task-number: QTCREATORBUG-16942 Change-Id: Ie50bdfdbf9005e383a2753a3c6081a563a175f61 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* iOS: Replaces ios_sim tool with simctlVikas Pachdha2016-10-1715-235/+788
| | | | | | Task-number: QTCREATORBUG-16947 Change-Id: Ia28d5e4f9f220d566bd64da73989e8c24ef3eb37 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Doc: Describe profile build configurationLeena Miettinen2016-10-171-3/+5
| | | | | | Change-Id: I1e4ef880423c16346f338fa41ff5b14708aced82 Task-number: QTCREATORBUG-17123 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Update qbs submoduleChristian Kandeler2016-10-141-0/+0
| | | | | | | To HEAD of 1.6 branch. Change-Id: I36b6804100a41e52a8f1ec20e987ffeed6721245 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* fix build of qmldesigner coretests against namespaced qtOswald Buddenhagen2016-10-141-0/+4
| | | | | | Change-Id: I6fcd87a4f1a3e59994ca13d559a215b789f02e96 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* Extend source creation script for other plugins/componentsEike Ziller2016-10-132-55/+111
| | | | | | | And implement that in Python Change-Id: I08d555927efffb0f8a4bafb54064ac2e5e06d730 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Changelog: Fix spellingLorenz Haas2016-10-121-1/+1
| | | | | Change-Id: Ibfd7bfc02e5f5c7b24b41f070917d4c67fb8a175 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Squish: Fix openVcsLog() when an OutputWindow is already shownRobert Loehning2016-10-121-0/+2
| | | | | Change-Id: I47432b7367f238a92921bffb030eada902327bd5 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Squish: Fix error handling in tst_git_cloneRobert Loehning2016-10-121-1/+1
| | | | | Change-Id: Id59ba23361beb0994f400647680e4facb223d22f Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* MSVC: Ensure the correct MSVC installation folder is detectedThomas Epting2016-10-103-5/+17
| | | | | | | | | | With this change, tools like Bullseye Coverage that wrap cl.exe are disregarded. Only true MSVC installation folders are considered now, which allows using Creator+Qbs with such tools again. Task-number: QBS-1000 Change-Id: Ifb49b3c032359aa4ba1bc702de0dc3d30d3b6075 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Debugger: Keep expansion state when stepping in QMLhjk2016-10-101-1/+2
| | | | | | Change-Id: I88c87c040fe276a4436d398ba777b98b6732f37a Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* AutoTest: Fix running selected quick test functionsChristian Stenger2016-10-101-1/+1
| | | | | | Task-number: QTCREATORBUG-17093 Change-Id: Ia404efe5779eaf5e735410db83840d9b9f58f5bd Reviewed-by: David Schulz <david.schulz@qt.io>
* Add changes file for 4.1.1Eike Ziller2016-10-101-0/+72
| | | | | Change-Id: I8416f825efe8b1369913c3cfda883a5b2149944e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Squish: Cloning installer-framework instead of jom in tst_git_cloneRobert Loehning2016-10-071-8/+7
| | | | | | | | | jom's repository can be cloned quicker than Squish can cancel the procedure, making the test instable. Cloning installer-framework takes a couple of seconds longer. Change-Id: I032a4bf60cfd3b070e4c311fbd1dae5b81e8fcd1 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Fix behavior with no_plugin_name_prefix in CONFIGRisto Avila2016-10-061-2/+6
| | | | | | | | If both plugin and no_plugin_name_prefix are defined in CONFIG, QtCreator would not assemble the file name correctly. Change-Id: Iebfc0402ff7c89f2a964cfcee77dfc77a6e5b0db Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Update German translationsRobert Loehning2016-10-061-1533/+2576
| | | | | Change-Id: I33dcbb0e98a961b1f2c75cd4a461e65daa93dd4a Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Remove 'What's this?' icon from "Waiting for applications" dialogKai Koehne2016-10-041-0/+1
| | | | | Change-Id: I6c603cd540d8c688fc6302380ea4e8c716ed8ef4 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Squish: Remove OSX specific workaroundChristian Stenger2016-09-301-14/+4
| | | | | Change-Id: I9e43c47c5ef2422d46e10b9f2fd88454b4352c30 Reviewed-by: Robert Loehning <robert.loehning@qt.io>
* Update qbs submoduleChristian Kandeler2016-09-301-0/+0
| | | | | | | To HEAD of 1.6 branch. Change-Id: I159f839b3f0203b7adfec9b49ab019e6f4243849 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* AutoTest: Fix retrieving metrics informationChristian Stenger2016-09-291-1/+1
| | | | | Change-Id: Ic0a1e1fbf8db613d0d6b20532a3ef404f625e7b1 Reviewed-by: David Schulz <david.schulz@qt.io>
* Fix that editor actions were disabled in navigation bar in debug modeEike Ziller2016-09-291-1/+1
| | | | | | | | | The mode widget needs the editor manager context, not only the debugger main window. Task-number: QTCREATORBUG-16543 Change-Id: Ibe92043a374d9fd507e62998f67c0ce897b198e7 Reviewed-by: hjk <hjk@qt.io>
* QbsProjectManager: Do not execute rules on initial project loadingChristian Kandeler2016-09-291-16/+0
| | | | | | | | | | The "rule execution only" type of build can lead to nasty bugs due to scanners getting called for files that don't exist yet. This effectively reverts a57e75884e. Task-number: QBS-1021 Change-Id: I85e7559060112428f8cd5872b95619ac26979743 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* QmlJs: qmlplugindump working directoryMarco Benelli2016-09-281-1/+5
| | | | | | | | | | | | | Use the plugin's parent path as working directory for the qmlplugindump process. This should be more reliable with regards to paths that include symbolic links to shared or remote volumes. Using the plugin's parent path will also be needed in order to handle relative paths passed to the dumper (ie: with the -dependencies option). This feature is not yet implemented in QtCreator. Change-Id: I9c863a95d03fc7d03c84e704e39f2e0520aaa01e Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* don't detect readlink a-prioriOswald Buddenhagen2016-09-271-6/+5
| | | | | | | | | | | it's pointless and causes an unnecessary delay. what's worse, we wouldn't actually know whether we found a compatible (gnu) readlink, so the fallback would never get activated. this would be the case on macos (the problem wasn't noticed so far, because on macos we build a bundle which doesn't need the wrapper in the first place). Change-Id: Ibf4c370d5d9e25064e80faeaf12eb5fa1bc68c20 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* fix hand-crafted symlink resolutionOswald Buddenhagen2016-09-271-1/+1
| | | | | | | | the base directory for making the symlink target absolute is of course the dirname of the original file, not the target itself. Change-Id: If5171ead8da0aa2afcaa8ccd6365771441440146 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.0' into 4.1Eike Ziller2016-09-271-0/+2
|\ | | | | | | Change-Id: If651b6a5fddcdec5ce62a195448a30152a01fca6
| * Macros: Check and reset currentMacro pointer after deletion4.0David Schulz2016-09-261-0/+2
| | | | | | | | | | | | Task-number: QTCREATORBUG-16933 Change-Id: Ib55d5dd4b0478b655d6cb31f28c8ceb38159912f Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | QmlProfiler: Fix flame graph model testUlf Hermann2016-09-271-6/+32
| | | | | | | | | | | | | | | | The flame graph keeps separate "flames" for compile and other QML/JS events now. The test has to be adapted to check for this. Change-Id: Ifdbc3331240d30a3acbb9df62a6a44654466273e Reviewed-by: Christian Stenger <christian.stenger@qt.io>
View Lorry Controller Status