aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* CppEditor: Lower reservation of parentheses per lineNikolai Kosjar2015-05-131-1/+1
| | | | | | | Change-Id: Ibefa62dd30cc35d4eb1997484e28d91f1ab0288f Task-number: QTCREATORBUG-14390 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* C++: Limit parsing of initializer clausesNikolai Kosjar2015-05-132-2/+15
| | | | | | | | | ...to prevent out of memory crash for generated tables. Change-Id: I8f9f51829fcce5bccfe0dba8852023f8dd7d6e37 Task-number: QTCREATORBUG-14390 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* Clang: Fix providing clang directory with intrinsics for *.qbsNikolai Kosjar2015-05-131-1/+1
| | | | | | | | This was forgotten in e488f10c7f630c3f3eba3c37faccbf487adf129c. Change-Id: I2fec272c9f1e44b3a691b782dcf6bee2a1768371 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Add changes file for 3.4.1Eike Ziller2015-05-131-0/+54
| | | | | Change-Id: Ic43e8d255ee36aa579c8a76da22e156346713dfa Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Help: Work around issue with Visual Studio < 2013Eike Ziller2015-05-121-7/+20
| | | | | | | | | | Visual Studio before 2013 had bugs in bool conversion of std::function, leading to "true" in some cases where it shouldn't. Task-number: QTCREATORBUG-14399 Change-Id: I8a1ad2f952247049355e11337ddf99f380ebde98 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Update qbs submodule.Christian Kandeler2015-05-111-0/+0
| | | | | | | To HEAD of 1.4 branch. Change-Id: Iaf125c6222efea1957dc5a68cbc100100e33095e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Squish: Weaken test for git summary in first commitRobert Loehning2015-05-111-1/+1
| | | | | | | | Linux test machines count 1673 files instead of 1675. If this is a bug at all, I don't expect it to be in Creator. Change-Id: I8202aae88ceda6b8bf472d8b9a7506862ad2473c Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Debugger: Fix attaching to running debug serverEike Ziller2015-05-072-10/+17
| | | | | | | | | | | | | | | | | For example when developing on Windows, cross compiling to Linux, the result is not executable from the Windows perspective. Reverts f2cfd3c01a2876150aa7fdc0a44adee33029f2c9 which changed the code to use ExistingCommand to get the automatic expansion of app bundles on OS X, and do automatic expansion of app bundles also when using path chooser of type File. Choosing an app bundle in a path chooser of type File would previously lead to an invalid entry in the path chooser anyhow, because the app bundle itself is not a file. Change-Id: Ie710c47918d2b8735009e290301ed2683e354f2c Task-number: QTCREATORBUG-14412 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: hjk <hjk@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* ProjectExplorer: Fix to eager clearing of output windowDaniel Teske2015-05-071-2/+1
| | | | | | | | | | | The window was cleared even if the option to clear it wasn't selected. Moving the cursor to the end, has the side effect of clearing the selection, so do that always. Change-Id: I6b61981f46394c61e61066aa8033c7e3391e6c07 Task-number: QTCREATORBUG-14410 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* QbsProjectManager: Fix deriving qbs profile names from kit attributes.Christian Kandeler2015-05-071-1/+3
| | | | | | | | Turns out that using Id::uniqueIdentifier() is not deterministic across invocations of Creator... Change-Id: I8b78a5b36c2cd61e4b9c5d8cc8eb2c6083282c01 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Fix Add Library for static librariesDaniel Teske2015-05-061-1/+2
| | | | | | | | | | Broke in 7481bff2b4a2e7391deac3dfdde0f33241a2e370 which split up LibraryTemplate in SharedLibraryTemplate and StaticLibrary. Change-Id: I797c007fff09ffd09b7744cf3543217b936dea12 Task-number: QTCREATORBUG-14382 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: BogDan Vatra <bogdan@kde.org>
* CdbExt: Setting actively which nodes should be expanded.David Schulz2015-05-064-42/+40
| | | | | | Change-Id: I1470a67aa559e4d93a01cc70701fb160e873317d Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com> Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* Debugger: Fix GDB hanginghjk2015-05-063-14/+15
| | | | | | | | | | This partially reverts commit e33da6a6b3c1b85d7bb6e961a60803eaf71afce5. GDB seems to hang while executing str(some_pointer) in some setups. Task-number: QTCREATORBUG-14374 Change-Id: Ia678533b9122e505b21ef6659d404239995ddb81 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Device support: Only restore SSH options if we really saved them.Christian Kandeler2015-05-051-2/+3
| | | | | | | | As the default-constructed value is not zero. This was not considered in 7aa8ae54ae. Change-Id: I1f32b1c317e0de34b48dbe003c3968f66133a64d Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Update qbs submodule.Christian Kandeler2015-05-051-0/+0
| | | | | | | To HEAD of 1.4 branch. Change-Id: I675cd578608380dbc20f67bdab0dbb414d605e08 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Doc: update the Qt Quick application tutorialLeena Miettinen2015-05-041-21/+18
| | | | | | | | | To version 3.4, but still using the Qt Quick 2.1 component. Task-number: QTCREATORBUG-14341 Change-Id: Ifd9638ea5b111554f2ea7838623104aab27963a3 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Sdktool: Add switch to set environment for kits.Tobias Hunger2015-05-044-12/+45
| | | | | | | | | | Use --env TEST=somevalue or --env TEST (to unset TEST) once per environment variable you want to set/unset. Task-number: QTCREATORBUG-14342 Change-Id: Ia968aeb55a9702d12bc0beb9a38bdd8309a18559 Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Sdktool: Fix default kit handlingTobias Hunger2015-05-042-12/+7
| | | | | | | | | | The default kit is addressed by its id, not its number for a long time now. Update sdktool accordingly. Change-Id: Iad0d0c6eda2aa824fa8add99871db7efebb30e75 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Add missing qmake functions to profile completerM. Moellney2015-05-041-1/+50
| | | | | | | | | | | | A lot of qmake expand and test functions were missing from the ProFileCompletionAssistProvider. This patch brings the database on par with the listing in the qmake build in functions from current qmakebuiltins.cpp. Change-Id: I635776f6b449d62fd6a505969451e8630fb26ee8 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Fix "Add new being disabled"Daniel Teske2015-05-041-0/+2
| | | | | | | | | A connection was missing, so the actions weren't updated on closing the new dialog. Change-Id: I3ee8c4ed3d7fc4a81dcdd067897f42ac70118b77 Task-number: QTCREATORBUG-14377 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Dist/GDB: Upgrade to 7.9Orgad Shaneh2015-04-303-3/+3
| | | | | Change-Id: I2ec8c663830e547bdf852dc3dde2dd12ccef0763 Reviewed-by: hjk <hjk@theqtcompany.com>
* Qbs: Compile fixRobert Loehning2015-04-291-3/+3
| | | | | Change-Id: I583407e1952a1645f557154592aa022f3baa0a79 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Squish: Test showing Creator's first commitRobert Loehning2015-04-293-1/+75
| | | | | | | Change-Id: Ibbd7a2ed6ac7c54a304fec057a61357fed3b4274 Task-number: QTCREATORBUG-14322 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com> Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Qbs: fix equivalent command line for "show command lines" option.Jake Petroules2015-04-291-1/+3
| | | | | | Change-Id: I91de51de3ce2fb0acc20b87992324e9ec8a26bc2 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Qbs: display native separators for qbs.exe file path.Jake Petroules2015-04-291-1/+1
| | | | | Change-Id: I979118e3552e75cd3a64c3b600a448e36214b646 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Editor: Limit size of generic proposal widget.David Schulz2015-04-281-3/+3
| | | | | | Task-number: QTCREATORBUG-14331 Change-Id: I3a120c82628e3cd43f9abc3c97021a3674300fbc Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* CDB: Unify handling of stopped debugger process.David Schulz2015-04-282-43/+5
| | | | | | Task-number: QTCREATORBUG-14344 Change-Id: Id05b16e649d39e354e6fda9ede9aa44984f3f429 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* BareMetal: Support seamless 3.3 -> 3.4 upgradeOrgad Shaneh2015-04-272-2/+17
| | | | | | | Change-Id: I49caf77ee5e9f08fdede9d6881a4da717c5da057 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: hjk <hjk@theqtcompany.com>
* Debugger: Fix Step into for unreachable frame source.David Schulz2015-04-271-0/+5
| | | | | | | | | | Hitting a frame without source code information when stepping inside functions results in a step out. Same is now applied to frames with unreachable source code. Task-number: QTCREATORBUG-9677 Change-Id: If7f7b417d98e8ab058fc98cef3041cb616579619 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Debugger: Fix jump to file/line breakpoint from disassemblerhjk2015-04-271-3/+16
| | | | | | | | | Triggered by double-clicking a normal source file+line breakpoint while looking at some disassembly: We want to jump to the original source file in that case. Change-Id: Ia6eddcaf27e4160c7a989ab757315f5314f65d1e Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* MimeDatabase: Avoid parsing the mime xml files multiple timesEike Ziller2015-04-271-6/+5
| | | | | | | | | | | | | | | At the moment we need to throw the parsed information away and reparse everything if we add another mime xml file (*), so make sure that we do not use mime information (which triggers a first parse) before we added all mime xml files. (*) we do that because the data for a mime type is distributed through a whole range of classes which do not easily allow to remove an already registered mime type, but we must be able to overwrite mime types from freedesktop.org.xml. Change-Id: I5e532875cc750af1da3e0139397279d7be203c27 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* Update qbs submodule.Christian Kandeler2015-04-241-0/+0
| | | | | | | To HEAD of 1.4 branch. Change-Id: Id69fc79579068f3a940d467a2d800d5f091cf6df Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Ukrainian translation update for 3.4Viktor Ostashevskyi2015-04-241-674/+3011
| | | | | | Change-Id: I3c8b0af8f204cf7c31f1452cf43bea82788e7cb2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Viktor Ostashevskyi <ostash@ostash.kiev.ua>
* About Plugins: Fix that disabling plugin could disable too many othersEike Ziller2015-04-241-0/+2
| | | | | | | | | | | | Only disable plugin rows with disabled *Required* plugin dependencies. Change 044eeacde5ee1add8b06a8a53b86fd5c6991d488 introduces another dependency type "Test", which are actually not dependencies in a strict sense and even can be cyclic, which makes this bug especially obvious. Change-Id: Ie504b4dd52670d838b712e88ae2e42123975b1d5 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: hjk <hjk@theqtcompany.com>
* Fix that CSS files where opened in C++ editorEike Ziller2015-04-241-0/+1
| | | | | | | | | | For some reason freedesktop.org claims that CSS files are text/x-csrc, so we explicitly make plain text editor the handler for text/css. Change-Id: I9685706523fff450ab10d1d0eb1850090e55c51a Task-number: QTCREATORBUG-14334 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* CMakeProject: Fix CXX Flags parsing for ninja projectsClaus Steuer2015-04-241-15/+25
| | | | | | | | | | | | | For ninja projects the "build.ninja" file is parsed to extract the cxx flags for each target. This file is located in the working directory of the "all" target, however since commit "65c113bc" qtcreator searches in the build directory of the current target. I have restored the search behavior to the previous state and added some code to ensure that the parsed flags really belong to the target Change-Id: I7cc7f6dbd4f12aec698133206da889037131bb13 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* CppTools: Remove separate indexing revisionNikolai Kosjar2015-04-247-14/+61
| | | | | | | | | | | | | | | | | | | | | | | | | For indexing we used a custom revision that was updated on each modelManager BuiltinIndexingSupport::refreshSourceFiles() call. This could lead to rejection of updated documents triggered by refactoring actions, like for the following case: 1. Open a project containing a.h and a.cpp 2. Open a.cpp, insert some new lines, save and close the document 3. Open a.h and rename a function that is defined in a.cpp --> The refactoring action modifies a.h and a.cpp, so re-indexing of those is triggered. Since a.cpp has already a higher revision (step 2) than the updated document, the updated document is discarded. As a consequence find usages and follow symbol fails for the renamed function. Now the document call back provided to CppSourceProcessor is responsible for updating the document revision based on the latest revision in the global snapshot. Change-Id: I4dfa0a4d34991655acfa749109f00c47b0fbfdbe Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* CppTools: Offer "override" and "final" as completion itemsNikolai Kosjar2015-04-242-0/+8
| | | | | | | | | | These are special identifiers and were thus not included in the 'add all keywords' handling. Change-Id: I7f65df5711193e945bfa955dcb70a6ab454606b5 Task-number: QTCREATORBUG-11341 Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* CppTools: Fix global completion after "/// text."Nikolai Kosjar2015-04-243-7/+33
| | | | | | | | | | | Like for other comments, don't try member completion if the doxygen comment ends with a dot. Task-number: QTCREATORBUG-8597 Change-Id: I2d5204ba8f45fc9ee94e285a907364cc722e62c7 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Debugger: Remove broken old LLDB QSet dumper workaroundhjk2015-04-231-4/+0
| | | | | | Task-number: QTCREATORBUG-13153 Change-Id: Ifc1393a9bedd0be793d752ad6af85221f5f8d247 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* RemoteLinux: Use base RunConfiguration if possiblehjk2015-04-233-11/+15
| | | | | Change-Id: I500faf9846f610f224808a4664d43d50cc5ad870 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Revert "QtQuick templates: add QML files to OTHER_FILES"Kai Koehne2015-04-229-18/+0
| | | | | | | | | | | | | | | This reverts commit 67581c5faa0f219bb16110e0f764e3dda73b4d72. The patch has multiple issues: Removing and renaming the .qml file will leave the 'other' place unaltered. Also, adding new .qml files won't add them to both places. Change-Id: I918aa398f9cd183378982fb15562e8fa66d3ede3 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* Debugger: Blacklist lldb-platform-* as possible debuggerhjk2015-04-221-1/+4
| | | | | | | Task-number: QTCREATORBUG-14309 Change-Id: I86bb47138a1e3d76120d1c2d0625a86036715d57 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* QtQuick templates: add QML files to OTHER_FILESJ-P Nurmi2015-04-229-0/+18
| | | | | | | | It's nice that main.qml shows up in the project tree under "QML" Change-Id: I4e8be4cc962f2d1c204e7435e0a67a88ea76db5e Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* qmljs: add import completion for QtQml & QtQml.ModelsJ-P Nurmi2015-04-221-0/+5
| | | | | | Task-number: QTCREATORBUG-13780 Change-Id: I9819e25559848f6635a83522b856da97679c5126 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Fix translation of help navigation panesv3.4.0Eike Ziller2015-04-212-5/+6
| | | | | | Change-Id: Ia82609d55311698ca675943cdfe7b2b91d6f59c2 Task-number: QTCREATORBUG-14241 Reviewed-by: hjk <hjk@theqtcompany.com>
* Wizards: Fix import for .ui.qml fileThomas Hartmann2015-04-211-1/+1
| | | | | Change-Id: I448dbdb9fcbd72e6388cd15268447c08eebc68f0 Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
* iOS: Fix detection of device information for older XcodeChristian Stenger2015-04-211-1/+1
| | | | | | Task-number: QTCREATORBUG-14072 Change-Id: Ia69aebcb4183ccca7ce8d2332b1482cbefba00a7 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Clang: Fix providing clang directory with intrinsicsNikolai Kosjar2015-04-202-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Opening a main.cpp of a Qt Widget Application project that is configured with a GCC toolchain leads to errors [1] like /usr/lib/gcc/x86_64-linux-gnu/4.8/include/ia32intrin.h:41:10: \ error: use of undeclared identifier '__builtin_ia32_bsrsi' due to a wrong determination of the clang directory with intrinsics. The directory was determined as $${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include whereas $LLVM_VERSION was extracted as e.g. "3.5" from 'llvm-config --version' instead of "3.5.0". The path of clang intrinsics dir shipped with Qt Creator (as package) does also match this version scheme: $QTC_INSTALL_DIR/share/qtcreator/cplusplus/clang/3.4.2/include [1] Visible with qtc.clangcodemodel.verboserun=true Change-Id: I1061912eef437a9889987e638915d2fabe208011 Reviewed-by: hjk <hjk@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Doc: Improve CPU Usage Analyzer documentationUlf Hermann2015-04-171-0/+30
| | | | | | | | Add sections about extra command line options and troubleshooting. Change-Id: I2ecd7b32a211321bcf9c31ee65f92386b70958db Reviewed-by: Kari Hautamäki <kari.hautamaki@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>