summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Fix wrong code in list/table model templatesDavid Faure2016-08-102-3/+3
| | | | | | | | rowCount should return 0 if the parent *is* valid, and return the actual number of rows when queried with an invalid index. Change-Id: I00e3d4ea79e1aaf0be1974da876c5a871d3924e6 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* [test] Use command line in proparserBrett Stottlemyer2016-07-111-0/+2
| | | | | | | The test reads the command line, but skipped the commit. Change-Id: If38a5fdd1ec129d77065bfd90403e21fea4eda6d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* fix qt namespace retrieval when an early break happenedOswald Buddenhagen2016-07-051-5/+5
| | | | | | | | | | the logic to retrigger the namespace retrieval was broken, so if it was triggered for some reason before qt was "sufficiently available", the bad/failed guess would persist. Change-Id: I90e02247142814bdc3f6d5cddfc0c2fe37665a3e Done-with: hjk Reviewed-by: hjk <hjk@theqtcompany.com>
* Update qbs submodulev4.0.3Christian Kandeler2016-07-041-0/+0
| | | | | | | To HEAD of 1.5 branch. Change-Id: Ib42ba2dcf30bbe8ad2b088cab1649da7375d5cd6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* QbsProjectManager: Fix crash on Kit updateChristian Kandeler2016-07-041-1/+1
| | | | | | | | Before accessing qbs::Project methods, we need to check whether this object is valid. Change-Id: I6c54f5b1118a3960b4814af647d81f5786fa452d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Add change log for 4.0.3Eike Ziller2016-07-041-0/+31
| | | | | | Change-Id: Ie7b27f2cc8ea1afad07d402aa3e68dc8bfa9116f Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Precompiled binaries no longer support macOS 10.7Eike Ziller2016-07-011-1/+1
| | | | | | | | Since we compile with Qt 5.7, macOS 10.8 is the minimum requirement for the binary packages. Change-Id: Id9a08739e8f720399960735fd3b2072320f154fe Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix crashes with (Runnable|Connection)::is<T>()Eike Ziller2016-06-281-2/+2
| | | | | | | | | | Another regression of 3f11ef92167 Default constructed Runnables/Connections have zero d pointer. Task-number: QTCREATORBUG-16507 Change-Id: I230b661eba4c408a353a711f93f3163160980793 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: hjk <hjk@theqtcompany.com>
* ProjectExplorer: Fix comparison with default-constructed Runnableshjk2016-06-241-0/+2
| | | | | | | | | | | | Regression was introduced with 3f11ef92167. The original check asserting 'that != 0' is still needed without dynamic_cast, as d-pointer of 'other' can be statically 0 for default-constructed Runnable objects. Change-Id: Ibee898ffc61fb2f4a6a6276390fdf6d517fde546 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Fix compilation with QT_NO_ACCESSIBILITYEike Ziller2016-06-241-2/+5
| | | | | | Task-number: QTCREATORBUG-16446 Change-Id: If75122c23a697f26ccf56391fe2e8d316aad6367 Reviewed-by: hjk <hjk@theqtcompany.com>
* Clang: Fix dot-arrow-correction for not-yet-parsed unsaved contentNikolai Kosjar2016-06-248-42/+117
| | | | | | | | | | | | | | | | | | | | | | | | The issue was re-producible with e.g.: void g() { // Type 'foo.' as fast as possible in the next line } This led to "foo->" with completion results as if there was no "foo." at all in that line. We relied on a correct position for translationUnit.sourceLocationAtWithoutReparsing(), but the just typed characters were not yet reparsed. And we do not want to reparse at that point since takes too long. We already determine the utf8 position for the dot character, so simply use that instead. This completes commit 17c1325cc45eb563333d28725a51c04e33cd01f2. Change-Id: I669888b5c17ee63b2aec7b16c9921f9d79e281f9 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* Clang: Fix dot-arrow-correction for zero resultsNikolai Kosjar2016-06-245-6/+22
| | | | | | | | | | | | If there are no completion items, do not add snippets since these will otherwise pop-up at undesired positions, e.g. when: 1) Typing float/doubles: 0. 2) Typing file suffix in include directives: #include "stdio. Task-number: QTCREATORBUG-16188 Change-Id: Ie1c29826dc62dc447b2ff57b0c5537eb9d9511ef Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* UnitTests: Disable small string testMarco Bubke2016-06-231-1/+1
| | | | | | Change-Id: I508e43923efc065fce9a79edebeff79606069abd (cherry picked from commit 505c9be9af58ad35c62f8fbbce3b7a77017204b3) Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Avoid using dynamic_cast<>hjk2016-06-2213-6/+74
| | | | | | | | | | | | | | | dynamic_cast<> breaks in cross-library situations. In the past the issue was witnessed on Mac, this time on FreeBSD in various configurations. The workaround deployed here is to manually create unique type ids in form of (addresses of) global variables. Task-id: QTCREATORBUG-16462 Change-Id: Ie28fbb3d31d06c1a722a3d9ea808831191298e71 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Ralf Nolden <nolden@kde.org> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Clang: Fix compiling unittest on windows.David Schulz2016-06-211-7/+3
| | | | | | Change-Id: Id48d494510ee53a9e888e22a752e8210f3d4ae2d Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* Add macos value to qbs.targetOS.Jake Petroules2016-06-201-1/+1
| | | | | Change-Id: I38f810ae72ff1f7ef428835b2eeeed6d726d4727 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* AutoTest: Avoid fetching WorkingCopy from multiple threadsChristian Stenger2016-06-201-4/+10
| | | | | | | | Instead fetch it once before starting asynchronous processing. Backported from 72e6dd2ab102ddb45ab3de12f61ab1d21c41e6eb on master. Change-Id: If159311d1ce244c39482acb2ed0d7e33907a2933 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* Doc: Link to released Qt Quick Controls 2 docsLeena Miettinen2016-06-202-2/+2
| | | | | Change-Id: I5ddb23ae1f78aae136869fd335030b530e1f266a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* cmake: resolve symlinks when comparing source directories.David Faure2016-06-203-5/+24
| | | | | | | | | | | Testcase: trying to use an existing build dir which was made for /d/foo where /d is a symlink to $HOME/d. To help understanding the problem, the error message now prints both source dirs, the one found in the builddir and the one we expected. Change-Id: I9a24fbd6ef3cf8108c5edba0d2a5b99ecdea0e89 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Bump VersionEike Ziller2016-06-203-2/+2
| | | | | Change-Id: Ifc422cd795803d419a7aba20e37923fb9084cf43 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Update qbs submodule.Christian Kandeler2016-06-171-0/+0
| | | | | | | To HEAD of 1.5 branch. Change-Id: I846f5f97071ad3567409dcdf6dfa7fe66931ada1 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Doc: Update info about creating JSON wizardsLeena Miettinen2016-06-173-47/+144
| | | | | Change-Id: Id45d3f9228ab35a57c0cc5a0d044bc510727c637 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Add changes file for 4.0.2Eike Ziller2016-06-151-0/+15
| | | | | | Change-Id: I987e481d45842e7f88e4d968eff01a261855a116 Reviewed-by: David Schulz <david.schulz@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* qmake ABI detection fix for NetBSD and OpenBSDRalf Nolden2016-06-141-5/+10
| | | | | | | | | | | | | The ABI dection works on inspecting the ELF header which should contain the values for ELFOSABI, with the macro ELFOSABI_NETBSD equals 2 and ELFOSABI_OPENBSD equals 12. However, on these systems the ELF binaries are built using 0 so detection will fail and default to Linux, preventing to use the correct qmake for Desktop Qt. Therefore, on these systems default 0 to use the host OS (NetBSD or OpenBSD), otherwise Linux as before. Change-Id: I293389980860977ba6c2ad9903edd567f0a5b9f0 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Bump versionv4.0.2Eike Ziller2016-06-092-2/+2
| | | | | Change-Id: Ic6c37187806ae2848d229693c9bf030dba5d50c5 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Change log: Fix indentationEike Ziller2016-06-091-3/+3
| | | | | | | | Some markdown implementations want 4 spaces for second list indentation level Change-Id: I0dfa3ac6c0ffe7231b56d4ec39ec51335cf5f018 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* qtcdebugger: Register as post-mortem debugger for 64bit applications as well.Friedemann Kleint2016-06-093-8/+60
| | | | | | | | | | | | | | Add mode argument to registry access helpers allowing to access the 64bit registry from 32bit applications and vice versa using special REGSAM values, similar to the new QSettings formats introduced in Qt 5.7. This allows for setting the 64bit post-mortem debugger when running as a 32bit application on 64bit Windows. The -wow argument is extended to indicate accessing the 64bit node from 32bit. Task-number: QTCREATORBUG-16386 Change-Id: I7f003673777e4b8c1b259ba1905a4207b4ce0b43 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* Cdb: Disable noisy symbol loading.David Schulz2016-06-081-1/+0
| | | | | | | | It may cause hick ups when debugging an application that has pdb files larger than 1 GB. Change-Id: I596d8f39396f39164f4b59df8ac0b06fbf2ad358 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Use general vc environment script instead of platform specific.v4.0.1David Schulz2016-06-061-3/+3
| | | | | | | | | | | Just use the specific scripts to detect whether a toolchain is installed. Partial revert of 2be4d2643a. Task-number: QTCREATORBUG-16359 Change-Id: Ic8c8fbc30f0c1269aeb51abbd21902097bd6c285 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Debugger: Revert parts of the 'arrayIndex' optimizationhjk2016-06-062-69/+79
| | | | | | | | | | The parent's address is not always the base address of the array data, but often a wrapper like QVector, so the correct computation of the item's address is more involved, removing the benefits of the optimization. Change-Id: Iecb19799addc1502649fefbad0953b77947f4193 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QbsProjectManager: Do not pop up the message pane.Christian Kandeler2016-06-031-1/+1
| | | | | | | | Only messages of type "info" appear there these days. They should not force the message pane to open. Change-Id: I2e0c01574eecffb7b9df41594df8abb6fd722397 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* QmlDesigner: Crash fixThomas Hartmann2016-06-031-2/+2
| | | | | | | | Trimm expression to avoid ambiguity that leads to assert. Task-number: QTCREATORBUG-16059 Change-Id: Id5f0378e38f0edeba22236c6e9519c8107e4a311 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* Update qbs submodule.Christian Kandeler2016-06-031-0/+0
| | | | | | | To HEAD of 1.5 branch. Change-Id: I29c839b4e249808124c225cc07f89cda97d5b755 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* More change log for 4.0.1Eike Ziller2016-06-021-0/+12
| | | | | Change-Id: I383cafdf23b254e07bb08232e75383279b0eb906 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Squish: Base getPaths() on new path functionsRobert Loehning2016-06-021-18/+5
| | | | | Change-Id: I54cd03bc1d24b715df15de37291f776f9867416f Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Squish: Provide functions for getting paths inside Qt installationChristian Stenger2016-06-012-3/+57
| | | | | Change-Id: I273304f0c6d451d28a256c99588479525eef95e4 Reviewed-by: Robert Loehning <robert.loehning@qt.io>
* JsonWizard: Check widget visibility when determining if it's mandatoryVictor Heng2016-06-011-1/+1
| | | | | | | | The wizard is unable to advance when a mandatory field is hidden. Assume a hidden widget is not mandatory. Change-Id: I19bdc1a661d91b75151d3aec34ad9d584002a556 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Squish: Replace remaining shell usagesRobert Loehning2016-05-312-18/+10
| | | | | Change-Id: Id7c2c1a17fed053f2e8601fc4c7716705e260431 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Squish: Silence more warningsRobert Loehning2016-05-311-1/+2
| | | | | Change-Id: I6259382a2359a795654a6d6536112c090ede130f Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Update qbs submodule.Orgad Shaneh2016-05-311-0/+0
| | | | | | | To HEAD of 1.5 branch. Change-Id: If6cfb3db0150ae6d49391996a6f2a279990e130b Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Debugger: Disable Run in Terminal with LLDB globallyhjk2016-05-301-0/+8
| | | | | | | | | This forcefully ignores the Run in Terminal setting, i.e. debugger starts up properly, but without the console. It a stop-gap measure deemed less harmful than the 4.0 'start up gets stuck' behavior. Change-Id: I015147c4db23bf91ea09001ce923fbab97eeae77 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Debugger: Move console stub procedure creationhjk2016-05-301-13/+11
| | | | | | | ... to a place where it can potentially be re-started. Change-Id: Icc7ba4512533cdef659507442eec069e073f84b1 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QbsProjectManager: Fix crash on project unloading.Christian Kandeler2016-05-301-12/+12
| | | | | | | | | We can't just blindly delete the qbs jobs after cancelling them, as that is not a synchronous operation. Task-number: QTCREATORBUG-16273 Change-Id: I29787da857e70404a1be1b4bc54921f5a8ce448b Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Squish: Adapt to changes in Quick Application templateChristian Stenger2016-05-302-12/+12
| | | | | | | The template has slightly changed in 6b506b34ec68315021dc80d6e0f595580586c98d. Change-Id: Id58e67beacaac046c6dd235b715f360dc7ef4c09 Reviewed-by: Robert Loehning <robert.loehning@qt.io>
* Revert "CMake: Pass STATIC types on cmake execution"Tobias Hunger2016-05-301-3/+0
| | | | | | | | | | I have missed that this change was headed for 4.0 instead of master. It breaks the build there. This reverts commit 0043c721c254607009b88732ec0d13f2af1f1191. Change-Id: Ia359798c2636b2b4699de9cc73484ec12a757601 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* CMake: Pass STATIC types on cmake executionOrgad Shaneh2016-05-301-0/+3
| | | | | Change-Id: Ie3401d009044a46af7fac314d1f29975543a44b0 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* CMake: Unindent a lambdaOrgad Shaneh2016-05-301-23/+23
| | | | | Change-Id: I71af11e3fba9a47c24b06bb19617ab212ee5b8a1 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Squish: Silence warnings in tst_default_settingsRobert Loehning2016-05-301-3/+4
| | | | | Change-Id: I668cc7b1fcb569b50d2178fe792f566721c9d4d4 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
View Lorry Controller Status