summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CMake: fix UI textv3.6.0-beta1Leena Miettinen2015-10-232-10/+10
| | | | | | Change-Id: I6803aa799e495007358dbc5f5ee6b8e1d2c6e874 Reviewed-by: Benjamin Zeller <benjamin.zeller@canonical.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Debugger: Fix "No such slot" warning in watchersOrgad Shaneh2015-10-232-2/+3
| | | | | Change-Id: Ia8994e1cb86a05571a3d41352ad5d46f0bdd351f Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Algorithm: Make filtered accept a member function pointerTobias Hunger2015-10-231-0/+10
| | | | | Change-Id: Ib71da93b3893ffb3309d00d7ce2dc803ff0eb4b4 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Add script for packaging a directory.Eike Ziller2015-10-233-68/+264
| | | | | | | | | | | Mostly 7zips the directory, all files must already be in place. On Linux the script also fixes the Qt related RPATHs. Changes the RPATH fixing to only change the Qt RPATH, instead of overwriting the complete RPATH to something custom. Change-Id: I1e07b7c0fcb4292197a4e743782a1392f6558747 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Text editor: fix UI text capitalizationLeena Miettinen2015-10-231-1/+1
| | | | | Change-Id: I0d8d481b043973b56c6c051b8c0224349451ff26 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* Debugger: fix capitalization of button labelLeena Miettinen2015-10-231-1/+1
| | | | | Change-Id: Ib83e8a8f858cb9c23752c63cb25202f69e164c30 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* Core: fix capitalization of JavaScript in a messageLeena Miettinen2015-10-231-1/+1
| | | | | Change-Id: I6f3392192a57ced81f7c051fb9df2032941e19f7 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Cpp: Add full stop to end of messageLeena Miettinen2015-10-231-1/+1
| | | | | Change-Id: Idbda9e71fcd2322c2925c5dbfdca540992660282 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Qmake: Remove PROFILE_BUILD_KEY from QmakeBuildConfigurationTobias Hunger2015-10-231-1/+0
| | | | | | | It is unused. Change-Id: I29ae0927a74b8f1ee6a66bf4ad99ac73e43e7170 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* BuildConfiguration: Add static helper to turn buildtype into a stringTobias Hunger2015-10-233-10/+21
| | | | | | | | Use that helper in the projectexplorer instead of hardcoding a mapping there. Change-Id: I8720607a869c086569661fc9e9326ed6e0f85bb3 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* CurrentBuild:Type: Do not mark these strings as translatableTobias Hunger2015-10-231-3/+3
| | | | | | | | They are constants that should not change based on locale. We have the CurrentBuild:Name for something that is localized. Change-Id: Ied7c123e0cdeee3f98ac6ea28e19137b9e70a9a8 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* Clear Case: fix UI textLeena Miettinen2015-10-222-4/+4
| | | | | Change-Id: Ic9b0481287a30312209bc84c1190e97087495e0f Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Squish: Update tst_qml_editor for fixed editorRobert Loehning2015-10-221-3/+2
| | | | | | | | In 3.5, the QML editor showed two empty lines at the end of the file. Now it's only one line so only one must be unmarked. Change-Id: I831002e5ab9d14570d2a788010806c0b3de5614c Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Doc: add docs for model editorLeena Miettinen2015-10-227-2/+327
| | | | | | Change-Id: I6bae6dc22de170c9f43cefe474e9b684675e4ff6 Reviewed-by: Jochen Becher <jochen_becher@gmx.de> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* JsonWizard: Keep "options" optionalTobias Hunger2015-10-221-3/+1
| | | | | | | Do not report an error if "options" are unset. Change-Id: I53f12624275be2d8af8d38da8dfe6bfa6603b948 Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* ModelEditor: Fix incomplete assignment of diagram's elementsJochen Becher2015-10-211-0/+2
| | | | | Change-Id: I81bbb05316a57c9c8c961f2d21c6604cbc9c6b2e Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Kits: Fix corner-case where default kit changed needlesslyTobias Hunger2015-10-211-5/+5
| | | | | | | | | | | Make sure we add Kits (and update the default kit) before removing existing kits. This prevents us from losing the information on which kit is the default one for some random kit selected when the previous default kit gets deleted. Task-number: QTCREATORBUG-15209 Change-Id: Ieee3b9fdbcbb4eec524103e4b871287c4de02fc7 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Algorithm: Make transform work with simple iteratorsTobias Hunger2015-10-211-1/+0
| | | | | | | | | | | | Do not require containers to provide a size() method. This makes for a less optimized insertion into the target container, but most Qt classes should still handle this ok. The upside is that e.g. the treemodel iterators can now be transformed. Change-Id: I4f149720631d9efb7b787332f039074b4c796965 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Algorithm: Mark output of filtered as Q_REQUIRED_RESULTTobias Hunger2015-10-211-0/+1
| | | | | Change-Id: I0518ed3c649efc8854cb5ef63c02e4def984cdd2 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Wizard: Add a wizard for item modelsTobias Hunger2015-10-217-0/+692
| | | | | | Task-number: QTCREATORBUG-7 Change-Id: Ibc06eda1b6596b08dd2e3be4e426c8b89be31064 Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* Doc: Clarify the setup of Clang Static AnalyzerNikolai Kosjar2015-10-211-4/+8
| | | | | | | | | | * Do not invoke the impression that the user has to download/configure a clang. * State explicitly that only the shipped version is known to work. Change-Id: I89ad346c2228ac6990a1932586ef2ad556f49379 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Add change log for 3.6Eike Ziller2015-10-211-0/+127
| | | | | Change-Id: I616e6133ee1b1b7dc952cf7f83054b5ef0d0b534 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* QmlProfiler: Don't update the time display during state transitionsUlf Hermann2015-10-201-5/+13
| | | | | | | | Previously, the display would show 0.0 while the profiler was waiting for the application to send data. That is somewhat confusing. Change-Id: I3ad85e5479c2cf3a65e6c4b411d959a5b15baae8 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Introduce Profile build modeUlf Hermann2015-10-2012-44/+92
| | | | | | | | | | | | We define a Profile build to be a Release build with separate debug info. You can thus change a given build from Release to Profile of vice versa by toggling the separate debug info checkbox. The messaging for future user interaction about Profile builds has to take this into account. Task-number: QTCREATORBUG-14009 Change-Id: I62a5b13993b20bf36329b1eefa8b1b6096f31644 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Detach QML debugging option from qmakes build modeUlf Hermann2015-10-203-28/+16
| | | | | | | | | | The coupling of qml_debug to qmake's Debug profile is both brittle and wrong. There are good reasons to also enable qml debugging in certain Release builds and changing the build type of a specific build often leaves the UI in an inconsistent state. Change-Id: I89cb86849c984278ebfc54f66f139ec482b18d9a Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Wizards: Use C++11 in all qmake projects created by the JSON wizardTobias Hunger2015-10-203-0/+6
| | | | | Change-Id: Idbe9053514ec94880df2d89a10ebe9bd4d9393b6 Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* QmlProfiler: Prevent interaction with buttons while loading dataUlf Hermann2015-10-204-12/+46
| | | | | | | | | | | | | | You could trigger invalid states by pressing the recording button while the profiler was waiting for data to be loaded from the application or by pressing the "stop" button twice. Now the buttons are disabled when they don't make any sense. In particular you cannot clear, change features, filter the display while recording and you cannot toggle the recording while loading. Pressing the "stop" button twice will cancel the loading now, similar to what happens if you first disable recording and then stop while the data is loaded. Change-Id: Ie5133f4bed76593dedc9763b778a2c5c17187543 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* CppTools: Minor cleanup in completion testsOrgad Shaneh2015-10-201-3/+3
| | | | | | | | * Remove superfluous dot from test file name * Reuse an existing member Change-Id: I735dee09ae7ceef4509a4bda87118baaf4d11b01 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* Fix deployment of qml2puppetEike Ziller2015-10-195-11/+27
| | | | | | | | | | | | The move to LIBEXEC_PATH broke running the puppet from the packages on Linux and OS X, because there it cannot find the platform plugin anymore. We need to add a qt.conf for it, and because Qt Creator.app/Contents/ Resources already contains the qt.conf for Qt Creator itself, the puppet must also move to its own subdirectory on OS X. Change-Id: I8e8cc48c49a01e10c7d7d3cc4c73020195cd5ca9 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* TextEditor: Add fine control over the color scheme settingsMarco Bubke2015-10-196-198/+318
| | | | | | | | | | | You have seen always all setting but some settings had no meaning because only the foreground color is used. Now you can disable this settings so it is more clear what you can change. Change-Id: I0fdd2ac6f40e27b5160a2c54a512289457674dae Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* Debugger: Adjust native mixed debugging after upstream changeshjk2015-10-1911-287/+446
| | | | | | Change-Id: I4d137fadd0de2aa346f2f49932faac4ee9ed41e7 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com> Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Clang: De-duplicate in Messages::registerMessages()Nikolai Kosjar2015-10-191-79/+32
| | | | | Change-Id: Id3c73249f562abd89de8e76290ea712c2fe7fae1 Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
* Clang: Polish tool tip text for diagnosticNikolai Kosjar2015-10-191-5/+6
| | | | | | | | * Set the category apart. * Show only the disable option and only in debug mode. Change-Id: If5f65f9bd04c8e37e376a9862035005f4456394a Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
* Tests: add missing column to tst_fileutils::parentDir testcaseDavide Pesavento2015-10-191-1/+1
| | | | | | | | | | | | The third column was accidentally removed from one data row in commit 271794fbc9cbeaa3393808691742893602de6cf5 Fixes the following fatal error: QFETCH: Requested testdata 'expectFailMessage' not available, check your _data function. Change-Id: I4a09df2e044b4dcee1ed2ffc589082a3e2601232 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* ProjectExplorer: Remove unused local variableOrgad Shaneh2015-10-191-1/+0
| | | | | Change-Id: Ic098ba98864cc1211358d975e4d14829d92d2ac0 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Snippets: Add license snippetsTobias Hunger2015-10-191-0/+123
| | | | | Change-Id: If3b3d9b4f602848ffe39c72a90d4b0f1275eb828 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* iOS: Refactor iOS tool chain and kit auto detectionEike Ziller2015-10-195-288/+250
| | | | | | | | | | | | | | | | | | | It was all done in one huge, unreadable method. The refactoring along-side fixes the following: - iOS tool chains were demoted to manual at start up because there was no tool chain factory that would auto detect them - a QTC_CHECK failed because single Qt Versions could appear multiple times in the architecture->Qt version map, because each architecture is present in two abis (32-bit and 64-bit) The refactoring also removes unneeded automatic conversion from non-iOS Qt version to iOS Qt version, and removes considering GCC toolchains (which were not handled anyhow, because only Clang "platforms" were considered). Change-Id: Ic9ae797646f159ed45959fc797990aa98f2136fb Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* ToolChainManager: Fix autodetected toolchains going manualTobias Hunger2015-10-161-2/+5
| | | | | | | | | | | The recent optimization to avoid running toolchains during startup has broken the registration of tool chains with the manager, resulting in auto-detected toolchains being demoted to manual in one run and then getting removed in the next (at which point a new set of toolchains got auto-detected). Change-Id: I175c7344238df1bcb36a8b4949f0f0faf8828116 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Fix compilationNiels Weber2015-10-161-1/+0
| | | | | | | Was broken after bdb0f264d2df0f59b3a9f0bc4732cd019ecfc1ff Change-Id: I3581da9d27f9609c2b3e4f74443ee59feef739dc Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Allow to clear search stringMontel Laurent2015-10-162-1/+7
| | | | | Change-Id: If88d74755e9f95d2aabd2aa770c9bdbb5bd98309 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* SearchResultWidget: Style cleanupOrgad Shaneh2015-10-161-8/+9
| | | | | | | | | * Use Qt5-style connect * Fix spacing around braces * Remove empty destructor Change-Id: I38373aaa45e84e8d8219aea2d672df0f817d8d65 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* SearchResultWidget: unclutter namespacesNikita Baryshnikov2015-10-161-13/+13
| | | | | | | | replace Q_ASSERT with QTC_ASSERT and be more consistent with asserts Change-Id: I81161a1ee82218ef23f62cc90e52587c342e2e22 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Debugger: Fix a warningNiels Weber2015-10-161-1/+1
| | | | | | | Followup to 01006580c10a4b9f8be689af61e90cd0f9134688 Change-Id: I4acd54472df03c019493426303d5a52a9902f9fd Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* ToolChainManager: Use Qt5-style connectsTobias Hunger2015-10-162-9/+5
| | | | | Change-Id: I68bebe6f1554e48513f130537434a1f7e22a0197 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* cdbext: adjust GDMI item names according to the ...David Schulz2015-10-161-3/+3
| | | | | | | change 525c33f9991766342b41a0518b534836dc60ed69 Change-Id: I778ef6893de24748d1d515e43937368cbe033683 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Debugger: Work around libstd++ crashhjk2015-10-161-2/+3
| | | | | | Task-number: QTCREATORBUG-15183 Change-Id: I7f0d00c984bb19f025b5e2f576017e0a982ed79a Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Debugger: Go back to QVector in GdbMihjk2015-10-163-6/+6
| | | | | | | | | We are overstretching std::vector implementations in some cases of partial self-assignment. Task-number: QTCREATORBUG-15183 Change-Id: I144e9e34df117286a7eef6403e29054d530cacbe Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Clang: Process diagnostics as soon as possibleNikolai Kosjar2015-10-141-1/+1
| | | | | | | ...on editor open. Change-Id: I02eb7092facedef9be5bf7b523ad840ebf1ecca9 Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
* Fix infinite QWaitCondition:wait() in discardFile*()Daniel Teske2015-10-141-13/+14
| | | | | | | | | | | | | | | | The original idea was that we would passively wait for another thread to clean up the locker, hence the check-sleep-loop. This was all dandy, except for *also* using the wait condition: this was a) mostly pointless (it would just avoid a few iterations of the wait loop) and b) buggy (if there were no other waiting threads, the actual reader thread wouldn't know that it needs to wake somebody up). As the passive waiting is ugly, we instead fix the use of the wait condition, and do away with the loop. Task-number: QTCREATORBUG-15181 Change-Id: I477dbe7cda49ceca9aa387910d94ad763a43012b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* Windows: Also deploy clang.exeEike Ziller2015-10-141-0/+2
| | | | | | | We need both clang.exe and clang-cl.exe for mingw and msvc Change-Id: I2f8883f2ac42636699d4326d4d5f044b34b7d9ba Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
View Lorry Controller Status