summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Make compilable with 5.114.2hjk2018-05-286-0/+7
| | | | | | | | | While it is understood that there won't be any further release from this 4.2 branch, it helps with bisecting Qt Creator when there isn't a need to build a contemporary Qt version as well. Change-Id: Icb722ca45f4a70b73a9a4932a103ae8e45b500a0 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Add danish (da) translation for Qt Creator 4.0scootergrisen2017-04-252-1/+40870
| | | | | Change-Id: Ie3d5f2f418d462df68ad3c646fcbebe225f0c6f6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Update qbs submoduleChristian Kandeler2017-04-041-0/+0
| | | | | | | To HEAD of 1.7 branch. Change-Id: If85142c2e7a33a51e0fc58b4f5e70cc1ea047242 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Prepare for upcoming compile breakagev4.2.2hjk2017-03-222-2/+2
| | | | | | | | | | | | Qt 5.9 is going to break source compatibility by making the QStringRef(QString *) constructor explicit. Since the use of that constructor rather looks unintentional here, replace its use. Change-Id: I6f5f2e79f7d92f6e80a1ea0aa12126d9c88b499e Reviewed-by: Jochen Becher <jochen_becher@gmx.de> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Squish: Make workaround permanent in tst_simple_debugRobert Loehning2017-03-201-2/+1
| | | | | | | | The fix is in 4.3 Task-number: QTCREATORBUG-17492 Change-Id: If155bd9b16a119e7b91161788708c21653222f8d Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Fix system options not being retained after restartVladislav Tronko2017-03-161-0/+6
| | | | | | | | | Auto-suspend unmodified files checkbox was always checked after restart, and min files to keep opened was set to 30. Change-Id: I7f52fee41155188ee8389e922fdc265f8c0a6459 Task-number: QTCREATORBUG-17844 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QRegExp include cleanupSamuel Gaist2017-03-1362-2/+73
| | | | | | | This patch adds the missing include statements for QRegExp. Change-Id: Ibb03b929940adb84ae190b5090cb6b88653cc14c Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* make fixnavi actually work with examplesOswald Buddenhagen2017-03-131-1/+2
| | | | | | | we reference examples by title, not by file name (as it's unknowable). Change-Id: I24e2a543138b77e8c6ea60e2aca49ba057c13273 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* ProjectExplorer: Evaluate -mfloat-abi for macrosNikolai Kosjar2017-03-131-0/+1
| | | | | | | | | | | | The option -mfloat-abi sets macros (in this case __ARM_PCS_VFP), so it should be evaluated while determining the macros for the code model and the clang static analyzer. Task-number: QTCREATORBUG-17797 Change-Id: I22a72d31956521b7e2ad7c1126036b25cfe0898d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Add documentation sub-targetsEike Ziller2017-03-101-2/+9
| | | | | | | | | | | To make it possible to build individual documentation sets with targets html_docs_<name> and qch_docs_<name>. Keep using the && chained commands for the (html|qch)_docs targets though, because we had issues with parallel documentation creation before. Change-Id: I80556bfaddb79aec3da3e09e4d4843b5d33be451 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* fix doc navigation linksOswald Buddenhagen2017-03-102-2/+2
| | | | | Change-Id: I0d05947ce6a9caef73c91ba9645bc305000a1794 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Doc: Update documentation writing instructionsLeena Miettinen2017-03-101-11/+18
| | | | | | | | | | The location of the TOC file and the built documents has changed. Qt WebKit has been deprecated. Added a link to doc build instructions. Change-Id: I1718e1c706a7e3fd34d2fa44116c0d5631b50f5e Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Include doc/ in dev packageEike Ziller2017-03-091-0/+1
| | | | | Change-Id: I64798d47d9f28826295d555432e3a1f63bbdde20 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Squish: Update tst_HELP06 after fixRobert Loehning2017-03-091-1/+3
| | | | | | | | This reverts commit 2cd684b09211d9a64abc387ebe4b7547ea9dffbe. Change-Id: I6543f96efa227e398dabaa14538ecc1f3174b757 Task-number: QTCREATORBUG-10585 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Create a reusable docs.pri for generating documentationEike Ziller2017-03-094-142/+115
| | | | | | | | | | | Since we cannot directly use qt_docs.prf since it contains various Qt specific details, adapt it for use in Qt Creator. This can then be used e.g. by plugins that are not part of the Qt Creator repository. Change-Id: I87511cad74cbcae5cb58087e9a9386130d635aa9 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Doc: Move the TOC to a separate page that is used as indexTitle valueLeena Miettinen2017-03-094-191/+224
| | | | | | | | | | This fixes the problem that the whole TOC is not visible in the Qt Creator Help mode Contents view (because it was generated based on the \table entries, not the \list entries). Task-number: QTCREATORBUG-10585 Change-Id: I86607e10db7172b2a7492e4ce1660c39390ef9ed Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Use correct AMDError constant name in iostoolJake Petroules2017-03-081-3/+3
| | | | | | | | Amends 350db24891a63b00b64439a836435da8b1aafe0b. Change-Id: I2e7e1903b2cae1d73be19e85c94e4199e8b2191a Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Add more change logEike Ziller2017-03-081-0/+37
| | | | | Change-Id: I797567d1dc01d57991f776cf36f2a6de3eff9a3c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Debugger: Fix QDateTime dumper for pointer valuesDavid Schulz2017-03-061-2/+4
| | | | | Change-Id: Idda3a7853e430e937ce6a99c9d4f0ab63403cb07 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Debugger: Do not add pointer suffix to encoded outputDavid Schulz2017-03-061-1/+1
| | | | | Change-Id: Ib02629825785b2589d641ea3268665b70a1acde8 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Doc: Remove unused QTC_LICENSE_TYPE defineEike Ziller2017-03-064-7/+2
| | | | | Change-Id: Iba49e6fc6b1d857cc0f87b5bf833f42a4a8a976f Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Squish: Fix kit selectionRobert Loehning2017-03-031-1/+1
| | | | | | | Fixes f78327a571a70f949574294a525cb0ef910c46f1 Change-Id: I7e9ea53c96a8382db27213a1d6e182fa865723ee Reviewed-by: Robert Loehning <robert.loehning@qt.io>
* Squish: Protect ALL_TARGETS against accidental changesRobert Loehning2017-03-031-1/+1
| | | | | Change-Id: I45efe55b87fb1e02e1b4016c9d94353c1823604a Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Squish: Test removing of kitsRobert Loehning2017-03-033-1/+67
| | | | | | Task-number: QTCREATORBUG-17702 Change-Id: I545e9f30dd61eae5a49ff0c56a63dc89f92ce6de Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Squish: Add function returning all available kitsRobert Loehning2017-03-032-13/+14
| | | | | Change-Id: I6699ad5c869dbbd413d0b1d113a169c2ec06511c Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Squish: Use list instead of bitfield for kitsRobert Loehning2017-03-0314-34/+30
| | | | | Change-Id: Ia2e1f3aa9ea723deb9f2a2c88e2f97be8ae0e833 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* iOS: Fix developer disk mount fail errorVikas Pachdha2017-03-031-4/+7
| | | | | | Task-number: QTCREATORBUG-17818 Change-Id: I172a3bc326ea777bed38e467c8a725acc68d13cd Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Git: Do not re-use diff controllerOrgad Shaneh2017-03-031-9/+6
| | | | | | | | | | | | When the controller is re-used, the file list is not refreshed. This doesn't cause a leak, since DiffEditorDocument::setController deletes the previous controller if already set. Task-number: QTCREATORBUG-17815 Change-Id: Ic30ef15f9df4fa1cc196dcd175e2df44a88b2f89 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Android: Fix app waiting for qml engine connectionVikas Pachdha2017-03-021-3/+20
| | | | | | | | | android app in mixed mode debugging sometimes keeps waiting for the qml engine connection. Task-number: QTCREATORBUG-17718 Change-Id: Iee87cd0a6d67babaf08e62a6e106ec22fda430cd Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Squish: Add error handling to tst_HELP06Robert Loehning2017-03-011-2/+9
| | | | | Change-Id: I448391f10d78b528ff321ef8974ee1c94bcbdc84 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Beautifier: Fix formatting with AStyle and make it more robustLorenz Haas2017-03-012-3/+7
| | | | | | | | | | | | Only version 2.04 added an extra newline. Later versions are fixed, so the should not remove a newline. In addition if piping is enabled we stream "\n" line endings so tell AStyle this explicitly by passing -z2. This disables the automatic detection which can be faulty with short code fragments. Task-number: QTCREATORBUG-17546 Change-Id: Ib90526234bfbc4d3530fd9c3a15bdfb3af02bebd Reviewed-by: David Schulz <david.schulz@qt.io>
* Squish: Wait a second in checkNavigator()Robert Loehning2017-02-271-0/+1
| | | | | Change-Id: I45bad30e28f7374ae10d5b0155e08d8297f44448 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Tests: Avoid race condition when building with multiple jobsChristian Stenger2017-02-271-9/+8
| | | | | | Change-Id: Ia5a110812694d03e6f6e02cf66b4aaf209224910 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Android: Ask to uninstall the app on version downgradeVikas Pachdha2017-02-242-1/+8
| | | | | | | | | Deploy step succeeds with error INSTALL_FAILED_VERSION_DOWNGRADE Task-number: QTCREATORBUG-17789 Change-Id: Ib1c3023cbea7df1802ce967f10b549db7208aa17 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* C++: Avoid inline namespaces in generated codeNikolai Kosjar2017-02-232-2/+83
| | | | | | | Task-number: QTCREATORBUG-16086 Change-Id: Ic2f3fd38ae6cc93725bc214c24320f40a0a519a8 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Debugger: Don't crash if targets vanish if the last kit is deletedhjk2017-02-231-23/+5
| | | | | | | Task-number: QTCREATORBUG-17702 Change-Id: I42cc08cab67f57d749898f5b01925b7ef3658165 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Fix that last session could reset to default sessionEike Ziller2017-02-231-1/+2
| | | | | | | | | | E.g. when opening and closing Qt Creator without opening a session. The last session may only be updated to the "active" session, if it is not the default-virgin session (which is actually a "no session" value). Change-Id: If47da30d94c20df62d45960224e3137bcc6ba1b8 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Debugger: Fix Qt 5.8 QDateTime dumper for cdbextensionDavid Schulz2017-02-232-22/+64
| | | | | | | Change-Id: Ic621cc67d647ab6396ddbef214ffcd104b66a1da Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Debugger: Pass Qt type info version to the debugger protocolDavid Schulz2017-02-233-9/+12
| | | | | | | | Fixes Qt 5.8 QDateTime python dumper. Change-Id: If6fab7bf3ea63372ef01942bcaa2121eb9c2b6db Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* BareMetal: Fix startup of OpenOCD in TCP/IP mode on WindowsDenis Shienkov2017-02-221-1/+4
| | | | | | | | | | | | | Previously, the OpenOCD utility fails as the startup arguments contains a wrong quotes wrapping for Windows OS. For example the 'gdb_port 3333' argument contains a single quotes, instead of double quotes, due to passed the Utils::OsTypeLinux parameter for any OS. We need to use the Utils::HostOsInfo::hostOs() function instead. Task-number: QTCREATORBUG-17765 Change-Id: I08acc4158baeca04e1b8685f1fdac40684f1c70c Reviewed-by: hjk <hjk@qt.io>
* Doc: Use "build for", not "build on", because it is misleadingLeena Miettinen2017-02-2112-24/+24
| | | | | Change-Id: I78e00bda752780c238f46d58f1821c7d7d616436 Reviewed-by: hjk <hjk@qt.io>
* Squish: Add some debug logging to openDocument()Robert Loehning2017-02-211-0/+3
| | | | | Change-Id: If34eaad1bd04a7d2409f0e00c217c7bd12add106 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* gcc2tasks.pl: Also detect errorsFriedemann Kleint2017-02-201-3/+4
| | | | | | | | Previously, the script would only detect warnings. Adapt the pattern to capture errors as well. Change-Id: I15ad97a9a1305aab91c046518f3c46b2e0c55127 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Update qbs submoduleChristian Kandeler2017-02-171-0/+0
| | | | | | | To HEAD of 1.7 branch. Change-Id: I81eb7e5d2bfd70382d4f3f672f07a403eacaada7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Git: Initialize members of StashInfoRobert Loehning2017-02-161-2/+2
| | | | | Change-Id: I20e644d61163bb91addcfe16a58692cfacb988d3 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* QbsProjectManager: Do not interpret Project::GeneratedFiles literallyChristian Kandeler2017-02-161-2/+15
| | | | | | | | | | | The files retrieved by calling Project::files() with this flag show up in the locator, in search results etc. So only consider files that we know to be human-readable. Task-number: QTCREATORBUG-17382 Change-Id: I7a66159e67207a09adb57b0c5584b0b067fd1fca Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* Settings: Do not crash when jumping to filtered out categoryEike Ziller2017-02-161-3/+9
| | | | | | Task-number: QTCREATORBUG-17677 Change-Id: I95633a905d71b981e0bb72ce4af2a2fed605f39d Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* ProjectTree: Remove "external file" warning when node is foundOrgad Shaneh2017-02-161-4/+10
| | | | | | | | | | If a new file is added, it is connected to the updateExternalFileWarning slot before the project tree is refreshed, and is not disconnected until closing and re-opening it. Task-number: QTCREATORBUG-17743 Change-Id: Icc7e3fe547a698d6f63116ca148cf1f4f8b60777 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Squish: Use cdb from Windows 10 kitRobert Loehning2017-02-142-9/+11
| | | | | Change-Id: I7e30848f583fd767bf6ad8a4accac7df41ce9167 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Doc: Setting qsTrId() call as default in Qt Quick Designer optionsLeena Miettinen2017-02-131-1/+8
| | | | | Change-Id: I36f696ea00f87787094d01423ef6308d208012a7 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>