summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* QmakePM: Sort function keywordsv4.2.0Orgad Shaneh2016-12-091-6/+6
| | | | | | | They are searched using std::binary_search, which expects sorted input. Change-Id: Ib2d59ab6e747e6ce36220dfd33dbe9bb145aeb92 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Update qbs submoduleChristian Kandeler2016-12-091-0/+0
| | | | | | | To HEAD of 1.7 branch. Change-Id: Ifde10cab3dd3f93cd95a2cb72a9017866683802a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* iOS: Fix app launch fail on debuggingVikas Pachdha2016-12-091-15/+15
| | | | | | | | Start the relay servers on the same port. Task-number: QTCREATORBUG-17407 Change-Id: Iad22cdebffdf3e88021718d4a7c232e08650c92e Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* iOSSimulator: Try to avoid flakiness of starting in simulatorEike Ziller2016-12-081-0/+4
| | | | | | | | | | Put in some delays between executing the various simulator commands, so whatever might need to startup internally has time to do so. Task-number: QTCREATORBUG-17336 Change-Id: I1d4fbbc14c8583fce1b72ee31d5fd4824f377efb Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Projects mode: Disable "Import" button if not supported by projectEike Ziller2016-12-081-0/+3
| | | | | | Task-number: QTCREATORBUG-17399 Change-Id: I79b64298c902776282d54d70efdc0eef03415a51 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* AutoTest: Fix internal modification of data tag locationChristian Stenger2016-12-081-1/+1
| | | | | | | Task-number: QTCREATORBUG-17398 Change-Id: Ibd4cc52ce16d4b7b9adb0ec6f857f6b3ae17e703 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* Android: Merge stdout & stderr channlesBogDan Vatra2016-12-071-2/+3
| | | | | | | | On Android 7.1.1 the error is fired on "stderr" on previous versions on "stdout" Change-Id: I72c06694a22084d455e26eea95ddfdb8a93a39b2 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* ios: Fix the default device iconsAlessandro Portale2016-12-072-8/+25
| | | | | | | | | | In 4.2 the IDevice constructors need to set the device icon, and I missed a few constructors. This should fix it. This patch will not apply to master, and should be skipped when merging. Change-Id: I66cf529dfe539a90a753dd15e8f069e1f11e8176 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlJs: disambiguate help lookupMarco Benelli2016-12-071-4/+34
| | | | | | | | | | | | The help system used to be confused by types from QtControls2, since they have often the same name and version as the ones in QtControls. This patch resolve the issue by looking for a number in the module name, and then using the url found as helpId. Task-number: QTCREATORBUG-16851 Change-Id: I48196d90b0fea5edf50751900864a39075894866 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* Debugger: Remove unused createBitfieldValue functionhjk2016-12-071-14/+0
| | | | | Change-Id: Ie439d9cd551c33e9c5db6c16e8d221d2c75a7218 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Add API 25 to known APIsBogDan Vatra2016-12-071-0/+2
| | | | | Change-Id: Ia06bd8638c8939918383b8274f06fc73d9c86122 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Debugger: Remove shadow variableOrgad Shaneh2016-12-071-3/+1
| | | | | Change-Id: Ia2e8ad88429a682f8569070eb8c12544f929d2a2 Reviewed-by: hjk <hjk@qt.io>
* Debugger: Suppress putting full environment contents into logshjk2016-12-072-1/+13
| | | | | | | | | | | People are known to put things like passwords into environment variables, and we pass the environment hexencoded to the debugged process, so it might be overlooked when logs passed around. Better not have the data in the log to start with. Change-Id: If93a42a291b8b62c38d01e606cc0e49b8f2e3e95 Reviewed-by: Filipe Azevedo <filipe.azevedo@kdab.com> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Debugger: Fix environment passing with LLDBhjk2016-12-072-26/+8
| | | | | | Change-Id: Ic51a5ee1b9ef69b60279f045175be6d59b53582b Reviewed-by: Filipe Azevedo <filipe.azevedo@kdab.com> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* UnitTest: Fix compile with gcc 4.8Christian Stenger2016-12-071-8/+8
| | | | | Change-Id: Id620b803bfff7b677d7552c1a7e9aba78e17802f Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* Doc: Update info on Beautifier optionsLeena Miettinen2016-12-061-8/+20
| | | | | | | | | | | | Clang Format options differ somewhat from the Artistic Style and Uncrustify options. Also, the "Format entire file if no text was selected" is enabled by default and also applies to Uncrustify. Change-Id: I19d6badbd71275a185894e8c5dff96826d378afb Reviewed-by: Lorenz Haas <lorenz.haas@histomatics.de> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Doc: Update Valgrind screenshotsLeena Miettinen2016-12-062-0/+0
| | | | | | | The icons have changed. Change-Id: I93150735a15228a9a21bd5586b5a633ca7f94fbc Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Doc: Describe the Import button in Projects modeLeena Miettinen2016-12-063-1/+1
| | | | | | | Update screenshots. Change-Id: I9bffcb3689ef4d4a4cd55161bb73ba6d25224710 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Qmake: Add some breaks so that the expected OS is selectedTobias Hunger2016-12-061-0/+2
| | | | | Change-Id: I3d0184bb408125eecb6a8e728fabe593233115c2 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Update qbs submoduleOrgad Shaneh2016-12-061-0/+0
| | | | | | | To HEAD of 1.7 branch. Change-Id: I882be8dad05ffcd9a2f3f0c78b278bb5d94b985b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectWindow: Add a buttons to import builds to project treehjk2016-12-061-30/+59
| | | | | | | | | | ... to a shortcut to the Kits setup page. This duplicates the functionality from the context menu but can be directly spotted. Change-Id: Ia5c2e1208346dc7191a04fbb9c2569ccab9aab31 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Debugger: Add a test to check the automatic expansion of 'this'hjk2016-12-061-0/+14
| | | | | Change-Id: I90fad62442d677ba441e2e61b660cae7ebea52ea Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Core: Make initial default window widerhjk2016-12-051-1/+1
| | | | | | | | | The new project window works better with 1280 pixel. Assume that is a good default width in 2016. Change-Id: I0c96db1bd279f6587e69c36ca01d1cd4f5243769 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmakeProjectManager: Compile fix after ebf8c1eaf06hjk2016-12-051-0/+1
| | | | | Change-Id: I4e1315dd7b1cdc11a355330dcad653667967ec8d Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* ProjectWindow: Delay panel update after target addinghjk2016-12-051-1/+1
| | | | | | | | | Parts of the machinery are not yet done when the signal arrives, waiting for next event loop iteration suffices to get a context enabling us to show the proper panel. Change-Id: Icbf33a4f5a900058ecc89ac125eb43313e12b74f Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Editor: Fix search result backgound for declarationsDavid Schulz2016-12-051-4/+0
| | | | | | | | | Don't add a background to a format without a background if a mixin is applied. Task-number: QTCREATORBUG-17314 Change-Id: Ie76fe7f69e98e9cfdfa290c40f0774dbe6f86cea Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* QmakeProjectManager: Use "Default encoding" for mechanized editingAlessandro Portale2016-12-051-2/+4
| | | | | | | | | | | | | | | When performing mechanized editing on .pro/.pri files, until now, Qt Creator reloaded and restored the file with [from|to]Local8Bit. That broke #comments in unicode. This change implements that the the "Default encoding" from the text editor options is used instead. Task-number: QTCREATORBUG-10274 Change-Id: I783fc3a2c6a2638e4603ced2eef25c2a3998e2c1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* BuildConfiguration: De-virtualize setBuildConfigurationhjk2016-12-055-28/+9
| | | | | | | ... and adjust users in Nim and Autotoolsplugins. Change-Id: I6133ca933a5a4dc4d7d9ff73c8ca7afaa51ae516 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* QmakeBuildConfiguration: Pass build dir to base setterhjk2016-12-053-9/+4
| | | | | Change-Id: I55bd47d62ef644257b49d3423c4d43a6443564aa Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Update qbs submoduleChristian Kandeler2016-12-021-0/+0
| | | | | | | To HEAD of 1.7 branch. Change-Id: Ic47bfa33e826cded51369fbd35572f0d7d5cca6f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Do not forget cmake generator information on loadTobias Hunger2016-12-021-2/+2
| | | | | | Task-number: QTCREATORBUG-17311 Change-Id: I3439933e396f74a092c9b46aaced0a73c33c4407 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Dumper: Fix QObject detection when using procedure linkage tablesChristian Stenger2016-12-022-2/+9
| | | | | Change-Id: I3ac9889b822cb30d2ccdb6a7e2452e753cc3f2df Reviewed-by: hjk <hjk@qt.io>
* Debugger: Allow QObject property extraction without debug infohjk2016-12-023-12/+52
| | | | | | Task-number: QTCREATORBUG-16908 Change-Id: I1e1e9d91a6317808610f39868383b67e5c80a9a4 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* AutoTest: Limit purging of test tree to project switchingChristian Stenger2016-12-021-2/+1
| | | | | | | | | | | Instead of purging the current test tree on all full parses, just purge the whole tree if the user switches the current project. If an item can no more be found after the full parse it gets removed anyhow. This avoids losing the check state on any full-parse. Change-Id: Ia7bae6ced65a69444adf0d7e2a554d90ddd5caa4 Reviewed-by: David Schulz <david.schulz@qt.io>
* Debugger: Switch on QObject name display by defaulthjk2016-12-025-88/+62
| | | | | | | | | | | ... and use the option to govern general QObject guts display. This allows people to completely avoid the performance impact of attempted QObject display and still makes the feature more prominent for our favorite use case. Change-Id: I1e53b6448f646ab7eea9168a3cd24c77769e6328 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Doc: Try to make the Projects mode sidebar docs clearerLeena Miettinen2016-12-021-33/+28
| | | | | | | | After receiving user comments. Change-Id: I525aba5121f0ce629838fa5146f44120283c7f12 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: hjk <hjk@qt.io>
* Doc: Describe excluding large files when indexingLeena Miettinen2016-12-022-1/+7
| | | | | | | ...in Tools > Options > C++ > Code Model. Change-Id: I8efda2f62a4efd5c782cc4460a3b0c3eebbd23a6 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* User docs: Describe the "Force probes" checkbox in the qbs build stepChristian Kandeler2016-12-022-0/+3
| | | | | | Change-Id: I467bd9bb518e38d714edf535a6e2eb6e805a6708 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix potential startup crashesMaurice Kalinowski2016-12-022-8/+10
| | | | | Change-Id: Id0f03b4fa9ff6a8f0f5b0de11fe51c3729065140 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Doc: Update SCXML Editor screenshotLeena Miettinen2016-12-023-0/+0
| | | | | | | | | The icons have been changed. Also create "doc versions" of two icons that did not look good when used in doc generation. Change-Id: I8b35e5ebdd2a837102fcb2826594b96914aeb1b4 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Debugger: Fix QObject parent pointer displayhjk2016-12-021-1/+1
| | | | | Change-Id: If8b6c7415d5cd6b8e5df6c2d760b015e3077c20f Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Debugger: Fix QStandardItem test with namespaced Qthjk2016-12-011-1/+1
| | | | | Change-Id: I610dfddd519057c5464d89f42508108c7f8abb14 Reviewed-by: hjk <hjk@qt.io>
* Doc: Fix typo "where" > "were"Leena Miettinen2016-12-011-1/+1
| | | | | Change-Id: I0dcbccfcbf29249149807c04f072d83fa503a895 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* qbs build: Fix one more relative pathChristian Kandeler2016-12-011-1/+1
| | | | | Change-Id: If8ad1fd77b3f79a23cb46addf56a91465d530057 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Debugger: Add dumper support for libc++'s std::weak_ptrhjk2016-12-011-0/+3
| | | | | Change-Id: Ie9041f95159e85c81f108aeff1564be136e4b7ef Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Debugger: Make QStandardItem dumper work without debug infohjk2016-12-013-2/+39
| | | | | | Change-Id: Iccdc693616558d2d224c1145eee78f903792c4a6 Task-number: QTCREATORBUG-16908 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Revert "Revert "Revert "Algorithms: Simplify Utils::transform implementation"""Eike Ziller2016-12-011-46/+80
| | | | | | | | | | | This reverts commit defb18aef413f0c9c99f957ebdd3bf1f8e2134e8. This reverts commit 602f8e72be21f9d1c68375a9e877b2e8524916cf. The refactoring of transform does not compile with MSVC2015 Update 2. Retry when we can upgrade to update 3. Change-Id: I8bfd6ad12c71759af4840c2615d9a8f2390fd4bc Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Version bumpEike Ziller2016-12-012-6/+6
| | | | | Change-Id: I25f835a66200a1f578deff65ca83aeb02c217790 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Doc: -1 is no longer supported in Diff Editor optionsLeena Miettinen2016-12-011-2/+1
| | | | | Change-Id: I83f19223cd78279a7c3946f7ffd0c85933c2a322 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Debugger: Move symbolgroup indices after expandingDavid Schulz2016-12-011-3/+35
| | | | | Change-Id: I0c2078b5c780a8f8f018e72c27575825c076cdd3 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
View Lorry Controller Status