summaryrefslogtreecommitdiff
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* 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>
* 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>
* iOS: Fix build with namespaced QtChristian Kandeler2016-10-181-0/+2
| | | | | Change-Id: I09f07ed853e0c9fba8b856d1851b5994f4318945 Reviewed-by: Christian Stenger <christian.stenger@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: 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>
* MSVC: Ensure the correct MSVC installation folder is detectedThomas Epting2016-10-101-1/+10
| | | | | | | | | | 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>
* 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>
* 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>
* 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>
* 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>
| * Debugger: Only use random QML port if none was givenUlf Hermann2016-08-111-8/+11
| | | | | | | | | | | | | | | | | | | | This is a cherry-pick of 20db17e4f07c298874f01eb0f9ebeb26a7887fdd from 4.1. The problem also occurs in 4.0 and as another version of 4.0 might be released, we should fix it there, too. Change-Id: I3cf42abfa9d0ea5812495be6e2728264dc115ba9 Task-number: QTCREATORBUG-16708 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>
* | Debugger: Fix expansion of items in tool tipshjk2016-09-261-2/+2
| | | | | | | | | | | | Task-number: QTCREATORBUG-16947 Change-Id: Id38b7dbf2773f04d2298a7dfee68fc0f280806e4 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | iOS: Fixes a random crash in Qt creator while closingVikas Pachdha2016-09-211-16/+31
| | | | | | | | | | | | | | | | | | The Qt creator crashed randomly while closing. Fixed the iostool process termination Task-number: QTCREATORBUG-14862 Change-Id: Ib356020095fe23f277389ebe30d8dedf4380ec28 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | iOS: Fixes false warnings about iOS kit and Qt versionVikas Pachdha2016-09-215-4/+14
| | | | | | | | | | | | | | | | | | | | iOS Qt version complains about missing compilers and the corresponding kit complains about unsupported device Task-number: QTCREATORBUG-16472 Change-Id: Ie2185e33ec5043de0230a325b48b21dc1a25109e Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Git: Avoid QProcess::waitForReadyRead in MergeToolOrgad Shaneh2016-09-202-14/+7
| | | | | | | | | | | | | | It's unreliable on Windows with Qt 5.7. Change-Id: I0703ae825e9db80ac8063d9f6962863a68591ed6 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Git: Do not rely on QProcess::readData/writeData in MergeToolOrgad Shaneh2016-09-202-32/+18
| | | | | | | | | | | | | | | | | | | | | | readData always returns 0 in Qt 5.7 (unless the process is not running)... Instead, write to the VCS output pane when reading from/writing to the process. Change-Id: Ie832d813d5a859b4ff5841fd2888783833c97945 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | iOS: Fixes QML debugging on iOS deviceVikas Pachdha2016-09-201-2/+8
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-15812 Change-Id: I7c495457961bad89ba3a1ca6a19dcd018c4e3a5b Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | ProjectExplorer: Fix infinite loop in mini target selectorOrgad Shaneh2016-09-191-1/+1
| | | | | | | | | | Change-Id: I454c1b6eb3361b2e610782585152243163acfd58 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | VCS: Only accept commit on Ctrl+Enter when enabledOrgad Shaneh2016-09-181-1/+5
| | | | | | | | | | | | Task-number: QTCREATORBUG-16808 Change-Id: I08442b027a6af300b2786e4510177bc050887ada Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | QmlProfiler: Announce correct features from memory usage modelUlf Hermann2016-09-161-1/+1
| | | | | | | | | | | | | | ... and make the test pass again this way. Change-Id: I0854688095af4385c4f57e113e3af03cca22e39f Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Continue process after lldb attachVikas Pachdha2016-09-141-2/+3
| | | | | | | | | | | | | | | | | | lldb stops the process after attaching and the event loop is not yet started. This makes the debugger wait for events while process is in stopped state Task-number: QTCREATORBUG-15705 Change-Id: Iae6fe94fc483d963b377582c4cbbb443be5e6cba Reviewed-by: hjk <hjk@qt.io>
* | Debugger: Fix detection of lldb via xcrunChristian Stenger2016-09-141-1/+1
| | | | | | | | | | Change-Id: If91efbd1d7a3e01440a3ed5ee0172975c2b0eff1 Reviewed-by: hjk <hjk@qt.io>
* | QmlProfiler: Don't accept compile events in memory usage modelUlf Hermann2016-09-141-2/+3
| | | | | | | | | | | | | | | | | | As compiling happens asynchronously it messes up the stack based approach used to attribute memory usage to QML/JS events. Compiling generally doesn't use the JavaScript heap, so we can ignore it here. Change-Id: If8cc4b0ad2b8c2e0531260a8b92b7e2cd76a6d56 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | QmlProfiler: Don't handle type IDs in memory usage modelUlf Hermann2016-09-142-0/+9
| | | | | | | | | | | | | | | | | | Events in the memory usage model should not be selected when a type ID is propagated from the statistics or flame graph model. The event in the respective QML/JS model should rather be selected. Change-Id: I6646358650f61c424c607e9dd8edb7fd9a61597e Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | QmlProfiler: Keep Compiling events separate in flame graphUlf Hermann2016-09-142-10/+21
| | | | | | | | | | | | | | | | | | | | | | | | The QML compiler can run asynchronously and produce ranges that don't match up with other QML/JS ranges. The flame graph model assumes that all ranges are perfectly nested, and produces incorrect data if they aren't. The compile ranges are perfectly nested among themselves, and the other QML/JS ranges are also perfectly nested among themselves, so we can fix this by keeping separate stacks for them. Change-Id: If4ea251c6a2e74bd04e142cf184937600ea31a87 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | QmlProfiler: Don't lie about the debug messages model's row countUlf Hermann2016-09-141-1/+1
| | | | | | | | | | | | | | | | | | The previous code would crash in the renderer if the type id is smaller than the detail type of the message. That is rare, but can happen. Change-Id: I7702284bc61a7c9227c7ad81ecf714255db5db9f Reviewed-by: Michael Winkelmann <Michael.winkelmann@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Output pane: Fix that height setting could resetEike Ziller2016-09-121-0/+2
| | | | | | | | | | | | | | | | | | When opening Qt Creator, and closing it without showing an output pane, it would write a height of 0 into the settings. Task-number: QTCREATORBUG-16829 Change-Id: Ia8ab0cea6620c4e654060f92f51bd5f0ce10e6b9 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Android: API-24 is not unknown anymoreBogDan Vatra2016-09-121-0/+2
| | | | | | | | | | | | Change-Id: Id0ce6b1fb289e356985d388f4843cffa24ddd77b Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | GccToolChain: Redetect ABIs if the targetAbi is invalidTobias Hunger2016-09-121-6/+7
| | | | | | | | | | | | | | | | | | Fixes issues with broken ABIs in the settings, like you get when going from QtCreator 4.2 to 4.1 and back. Task-number: QTCREATORBUG-16823 Change-Id: Ibcab5d3bc8255dfeb647e512f5db1d94155f9d9a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Help: Fix online documentation pathEike Ziller2016-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | When trying to open pages that should be in the installed documentation, but are not, we try to open the page from the online documentation in the external browser (e.g. for the links from Welcome mode). Looks like the online documentation moved. Change-Id: I7a8eaf37783661dc4751a12b65efeac419d3a802 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | QmlProfiler: Keep Compile and QML/JS statistics separateUlf Hermann2016-09-092-43/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The QML compiler can run asynchronously and produce ranges that don't match up with other QML/JS ranges. The statistics model assumes that all ranges are perfectly nested, and produces incorrect data if they aren't. The compile ranges are perfectly nested among themselves, and the other QML/JS ranges are also perfectly nested among themselves, so we can fix this by keeping separate statistics for them. Also, choose a less insane data structure for the relatives model. Change-Id: I146593b67586e7b5aba6b19d360961c142511289 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Beautifier: Accept C and Objective-C files by defaultLorenz Haas2016-09-081-1/+2
| | | | | | | | | | | | Task-number: QTCREATORBUG-16806 Change-Id: I2f553fc82e9f0a192caaf4594227da3bb643b118 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | CppTools: Fix loading of .config filesVersus Void2016-09-061-2/+2
| | | | | | | | | | | | | | | | | | .config file wasn't considered during creation of injected configuration file thus disabling code processing inside #ifdef blocks. Task-number: QTCREATORBUG-16236 Change-Id: I50f21622ec1b246aaa80e4832fd826f1b61d8e96 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* | RemoteLinux: Try SIGTERM first when terminating processesChristian Kandeler2016-09-061-1/+2
| | | | | | | | | | | | | | | | This was done for the "kill by process name" operation, but not for the "kill by PID" one. Change-Id: Ia8eb57d1fa030624470489dbd0e7b03093fd822b Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Fix debug on Android 6+ with NDK r11+BogDan Vatra2016-09-054-2/+15
| | | | | | | | | | | | Task-number: QTCREATORBUG-16721 Change-Id: Ic65f13076794b75d6e4551b68d26fd3752f82098 Reviewed-by: hjk <hjk@qt.io>
* | Android: Fix package name searchBogDan Vatra2016-09-051-4/+10
| | | | | | | | | | | | | | | | Android 7.0 ps doesn't add \r anymore to the EOL. Task-number: QTCREATORBUG-16782 Change-Id: Iff596ac2c1eafd0c5422cbac5708c8b616c73ecf Reviewed-by: hjk <hjk@qt.io>
* | Adding logging rule qtc.*.info=false to disable output by defaultThomas Hartmann2016-09-013-4/+4
| | | | | | | | | | | | | | | | | | I also added the qtc prefix to all logging categories. Task-number: QTCREATORBUG-16767 Change-Id: I04214dba9912fe6c669f10566582d6009b5d75f0 Reviewed-by: Robert Loehning <robert.loehning@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | QmlDesigner: Do not remove puppet stream if puppet crashesThomas Hartmann2016-09-011-1/+0
| | | | | | | | | | Change-Id: I0374fbd9007cd8965b886e5f0a872434046e2bcd Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
View Lorry Controller Status