summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Update qbs submodule.Christian Kandeler2015-06-181-0/+0
| | | | | | | Fixes MSVC 2010 build. Change-Id: Ia4a15e2d289b288c77fc5e52d717cb0d1a1960da Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
* Update qbs submodule.Christian Kandeler2015-06-181-0/+0
| | | | | | | To HEAD of 1.4 branch. Change-Id: I64a6099bf67d4705c657e36f6c79d53c33729d13 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Update qbs submodule.Christian Kandeler2015-06-181-0/+0
| | | | | | | To HEAD of 1.4 branch. Change-Id: Ifc6ad172a2ae10d8461e9ebeaea2dc9396fd6daa Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* support Visual Studio 2015Joerg Bornemann2015-06-157-8/+33
| | | | | | Task-number: QTBUG-46344 Change-Id: I49c3e2776e65cc83d40d1f5ab3be1365d17242d1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Valgrind: Fix possible crashesChristian Stenger2015-06-152-6/+4
| | | | | Change-Id: Ifae94d68d6c83f65a1938bfe41b4c5932407c0cf Reviewed-by: hjk <hjk@theqtcompany.com>
* Update qbs submodule.Christian Kandeler2015-06-041-0/+0
| | | | | | | To HEAD of 1.4 branch. Fixes OSX build. Change-Id: I5ea2756d0764e54b41bcbd2dff5e8083af31e768 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Adapt to qbs' libexec infrastructure.Christian Kandeler2015-06-034-0/+17
| | | | | Change-Id: Ic2d609e017d201b7b3e0b3bcb08359652428aeaa Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Update qbs submodule.Christian Kandeler2015-06-031-0/+0
| | | | | | | To HEAD of 1.4 branch. Change-Id: I6eb26ac7ef151a71021effad1fb4168135fd9352 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix parsing of old settings with sdktoolKai Koehne2015-06-031-0/+2
| | | | | | | | | | | | With commit 5aba7fb09504e1a the sdktool started to save id's in a QString (instead of a QByteArray). Commit b2e3f0262bbf5de4 then adapted also the parsing. However, this broke the parsing of existing settings still using a QByteArray. Task-number: QTCREATORBUG-14545 Change-Id: I6c991d9d130602c7e9b3146b4d7b17555056a8ef Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Add profile completion keyword VERSION_PE_HEADERM. Moellney2015-06-011-0/+1
| | | | | | | | | | qmake of Qt 5.5 introduces a new predefined variable VERSION_PE_HEADER. It was not part of the known keywords for the qmake profile editor. This patch adds VERSION_PE_HEADER. Change-Id: Iae671d89ff623c4062da621e571769df736fa6d3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* RemoteLinux: Fix upload for target file paths with spaces.v3.4.1Christian Kandeler2015-05-291-4/+8
| | | | | | | | | | | | | | | In addition to causing an unhelpful error message, we would also create directories at unwanted places. For instance, deploying to a directory called "/tmp/test dir" would result in this: mkdir -p /tmp/test dir Which created two unwanted directories, one of them at a completely unrelated place. Task-number: QTCREATORBUG-14518 Change-Id: Ie1c287ca73d0815b9bed335141adb901e361e3e6 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Karsten Sperling Opdal Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Help: Fix that user registered documentation was auto-removed on windowsEike Ziller2015-05-281-1/+1
| | | | | | | | We may not use native path separators for internal data. Task-number: QTCREATORBUG-14249 Change-Id: I0f00db235608e81cfefdd2359378020c7376768f Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* Timeline: Emit heightChanged() when empty changesUlf Hermann2015-05-261-1/+3
| | | | | | | | | The height of a model is 0 if the model is empty. Thus, when clearing we have to emit heightChanged(). Change-Id: I6f05c2a32cff648d6aa8e623e17aebe9ae4fcb5c Task-number: QTCREATORBUG-14507 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Core: Fix compile with MSVC 2010Christian Stenger2015-05-261-1/+1
| | | | | | | Introduced with 66f603628b62b6865ebd039b729713c0a64ae851 Change-Id: Ifd114e7360bd5ee729d29a0f03116458d56c2afa Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* QtWebKit HelpViewer: Fix that "Open in New Page" was visible where it shouldn'tEike Ziller2015-05-262-9/+1
| | | | | Change-Id: I707f348965cb66085e9e9b7b47613c65974a5f55 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Adapt MSVC output parser to MSVC 2015.Friedemann Kleint2015-05-222-3/+23
| | | | | | | | The space character after the line number was removed from the compiler messages. Change-Id: Ia249a6d4416744c67aada2eb2c5c26cf87bd7ef7 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Items were removed from QML overview when dragging onto editor viewEike Ziller2015-05-221-0/+6
| | | | | | | | Change-Id: I6e8b3cbedb78df08066f87d4aa9922145cfa151c Task-number: QTCREATORBUG-14496 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com> Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com> Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* Update qbs submodule.Christian Kandeler2015-05-211-0/+0
| | | | | | | | To HEAD of 1.4 branch. Task-number: QTCREATORBUG-14482 Change-Id: I97b870fe11fca3553015e79b5229096aa5d8cf2b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* QmlProfiler: save and load input eventsUlf Hermann2015-05-211-7/+22
| | | | | | | Change-Id: Ibb70d98a6b2ceeb72059a7a421ce2e1a38233d87 Task-number: QTCREATORBUG-14491 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Debugger: Remove a wrong soft assert in breakpoint handlerhjk2015-05-211-5/+6
| | | | | | | | | | The code path can be triggered legitimately by removing breakpoints without direct file association like "Break on throw" in the breakpoint view. Change-Id: If32a990f76d86386e40123c8f7a90613e15ca670 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Debugger: Optimize insert watch item.David Schulz2015-05-211-4/+4
| | | | | Change-Id: If15afbbc7bcf33367755cfd61d47670a28038e6f Reviewed-by: hjk <hjk@theqtcompany.com>
* Fix DockWidgetBogDan Vatra2015-05-201-3/+2
| | | | | | | | | | | | | | | | | DockWidget keeps a pointer to the initial inner widget which might change/delete. Ex: QWidget *w = new QWidget; w->setWindowTitle("title"); QDockWidget *dock = addDockForWidget(w); //... dock->setWidget(0); // we want to set another widget delete w; Change-Id: I04e3d1075787092f3789f32442990aa76848d1b7 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com> Reviewed-by: hjk <hjk@theqtcompany.com> Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Fix untranslated messagesSergey Belyashov2015-05-194-7/+13
| | | | | | | Change-Id: I21ff7f3f70116944ba08ea18bdeeb258c0984f09 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* QmlJS: Mark some overridden functionsOrgad Shaneh2015-05-181-3/+3
| | | | | Change-Id: I5c85dda01a442e4b227c846d6fa5057e1fe82939 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Search results: Fix that auto-expand failed on first set of resultsEike Ziller2015-05-181-2/+14
| | | | | | | | | | They were expanded but collapsed again when the model was reset in the setShowReplaceUI(bool show) call. Avoid resetting the model by informing about the data change individually. Change-Id: I48a94f2aec5b5d31d11166a299a2463b757939fa Task-number: QTCREATORBUG-14320 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* Help: Fix QDesktopServices url handler for qthelp urlsEike Ziller2015-05-181-1/+1
| | | | | | Change-Id: If55a35fcd0960bd7ac215493ccc7e4118a8c3187 Task-number: QTCREATORBUG-14459 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* Debugger: Fix crash in breakpoint viewhjk2015-05-181-4/+7
| | | | | | | | | ... when double-clicking on an entry for which debug information but no corresponding sources were found. Change-Id: I48f57794e072752d444d7c3ccd8bfe517c9db1dd Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* TimeLine: remove strange selection lock magicJoerg Bornemann2015-05-181-6/+0
| | | | | | | | | | | Let the user decide whether to select items on mouse over by pressing the respective toggle button. The current magic is hard to grasp and mostly just annoying. Change-Id: Ied6bb36bd675bdc7ad237f841ecd345ad6c97e7a Task-number: QTCREATORBUG-14415 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* Timeline: Make 0-width events visible again.Ulf Hermann2015-05-182-4/+5
| | | | | | | | | | | Events with duration == 0 were erroneously filtered out by the items render pass. Also, we have to give them a very small width in order for the "stretching" mechanism in the vertex shader to work. Change-Id: Icb76168f0831547a3ca55ab79df7161736ed4dc4 Task-number: QTCREATORBUG-14446 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Override text/x-csrc mimetype with QtCreator's own versionBogDan Vatra2015-05-151-0/+7
| | | | | | | | It is necessarye because fredesktop's version searches for /* and // magic which is found in other files (e.g. .qml, .js, etc.) Change-Id: I9cd3341167e5a0aa57d6046f4492bab241055c4b Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* CppTools: Allow to limit the files to process by file sizeNikolai Kosjar2015-05-134-3/+65
| | | | | | | | ...with the environment variable QTC_CPP_FILE_SIZE_LIMIT_MB. Task-number: QTCREATORBUG-14390 Change-Id: Iaefaa1a3db023b58f9351b96e1b9e2139797e280 Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* 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>
* 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>
* 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>
* 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>
* 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>
* Qbs: Compile fixRobert Loehning2015-04-291-3/+3
| | | | | Change-Id: I583407e1952a1645f557154592aa022f3baa0a79 Reviewed-by: Christian Kandeler <christian.kandeler@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>
View Lorry Controller Status