summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add change log3.4Eike Ziller2015-07-011-0/+19
| | | | | Change-Id: I5646a0fba9d85f72491ff160d65607f5f01a23bc Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Documentation: Describe the non-prefixed "Device:*" variables.v3.4.2Christian Kandeler2015-06-221-4/+4
| | | | | | | | | | These are the ones that people should use in build steps and such. Task-number: QTCREATORBUG-14614 Change-Id: I398ee57a0338c16f41dd190abe3fc9b055a50132 Reviewed-by: hjk <hjk@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* 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>
* Squish: Remove outdated kit handling codeRobert Loehning2015-06-164-33/+5
| | | | | Change-Id: I69f1b6d0d27e9330ff23de0b9d5a09ef02f353ac Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Version bumpEike Ziller2015-06-162-2/+2
| | | | | Change-Id: I4a9cde2300b1cc14feadaa6240fefebc57fd0e19 Reviewed-by: Eike Ziller <eike.ziller@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>
* Fix typo in French translationRobert Loehning2015-06-101-1/+1
| | | | | | Change-Id: I1eda15d0ea1abcd2f160a11d06e8a89d72ffa1f7 Task-number: QTCREATORBUG-14561 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* Fix OpenGL on Linux with Qt 5.5Eike Ziller2015-06-051-1/+1
| | | | | | | The XCB platform plugin now needs a plugin for the OpenGL backend Change-Id: I5e7b296a0b645aec2a8d3ba80c53cb946e35e7f1 Reviewed-by: Laszlo Agocs <laszlo.agocs@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-036-0/+26
| | | | | 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>
* Revert "Squish: Fix verification in tst_rename_file"Robert Loehning2015-06-031-1/+1
| | | | | | | | | Didn't think of the bug mentioned in my own comment. Sorry. This reverts commit c7b7fde2bf1dc4d60e248c63368fb43154b0455b. Change-Id: Ida2791a7c985c8036194df437c720a170a39458e Reviewed-by: Christian Stenger <christian.stenger@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>
* Squish: Fix verification in tst_rename_fileRobert Loehning2015-05-291-1/+1
| | | | | | | | | | | | This doesn't change anything until we replace the used project. main.cpp or utility.cpp may get the tempFiletype "Headers" and then the test will crash because the file can't be opened. In addition, only files with filetype "Headers" are included in other files, so verifying including of other files is pointless. Change-Id: I30b20269a800eca5ef51de3af209e674da5189bd Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Squish: Update to changed behavior when renamingRobert Loehning2015-05-291-6/+1
| | | | | | | | | The bugreport I wrote about this was rated invalid so now this is the expected behavior. Change-Id: Ia187062552ad9d4857b5078d4c9c5dde4c8b7521 Task-number: QTCREATORBUG-14469 Reviewed-by: Christian Stenger <christian.stenger@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>
* More changesEike Ziller2015-05-281-0/+7
| | | | | Change-Id: I38a0c5cef0f22e1b7eda218c3992fcecfe728455 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@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>
* Escaped a special character in the XML fileVenugopal Shivashankar2015-05-271-1/+1
| | | | | | | | | | | Without it, Qt creator complains that the XML file is invalid and it could not be parsed. Made a language edit as well based on the sanity bot's recommendation. Change-Id: I04acd60d9ee4f5f29f443fa56beed6ecfbdbef64 Task-number: QTBUG-41996 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@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>
* msvc2tasks.pl: Adapt to MSVC2015.Friedemann Kleint2015-05-221-1/+1
| | | | | | | | | The format of the compiler warnings changed: c:\foo.cpp(395) : warning C4800: 'BOOL' : forcing value to bool 'true' or 'false' (performance warning) c:\foo.cpp(395): warning C4800: 'BOOL' : forcing value to bool 'true' or 'false' (performance warning) Change-Id: Iaa04d8fedbb0a3da2802be1c860d54fefb7bfe5d Reviewed-by: Tobias Hunger <tobias.hunger@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>
* Russian translation updateSergey Belyashov2015-05-191-8/+4
| | | | | | Change-Id: I56133c7459be50efe5eda7382de7a211a62ba34c Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* 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>
* Squish: Don't analyze kits which take too longRobert Loehning2015-05-191-0/+2
| | | | | | Change-Id: I18e2cb163f2aef81ca34994a38ceb4865b2ae5ad Task-number: QTCREATORBUG-14307 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* QmlJS: Mark some overridden functionsOrgad Shaneh2015-05-181-3/+3
| | | | | Change-Id: I5c85dda01a442e4b227c846d6fa5057e1fe82939 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* More change logEike Ziller2015-05-181-0/+1
| | | | | Change-Id: Id98acf623a7d5aa55c98f4c3db6e0a5447f59b7d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Doc: More troubleshooting hints for perf profilerUlf Hermann2015-05-181-3/+13
| | | | | | | | | Apparently the chosen event type influences the stability of the recording process and you can change the event type using the additional arguments. Change-Id: I0e1982d4d469e1e4d17e2aa01d3c5166ce8817a3 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Run macdeployqt for the remaining auxiliary executables.Jake Petroules2015-05-182-0/+13
| | | | | | | | | This fixes broken library paths for buildoutputparser and qbs executables on OS X, making them unusable out of the box. Task-number: QTCREATORBUG-14432 Change-Id: I81c64f962b0a1eee2800da04b5202f5fd9efb706 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.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>
* More change logEike Ziller2015-05-181-0/+7
| | | | | Change-Id: Iedc533079f0eaa7f0dd2cc241b012c3e07d935b0 Reviewed-by: Eike Ziller <eike.ziller@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-183-12/+18
| | | | | | | | | | | 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>
* Version bumpEike Ziller2015-05-152-2/+2
| | | | | Change-Id: Icba0aa76b9db40c46c026177637c5ea92593c4c0 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>
View Lorry Controller Status