summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* .gitmodules: Use trovebaserock/v3.6.1Javier Jardón2016-03-221-1/+1
|
* Android: Fix possible crashv3.6.1Tobias Hunger2016-03-081-1/+2
| | | | | | Change-Id: I1b73a077f6d2f157d4367358f9f156d32b3e6cea Task-number: QTCREATORBUG-15832 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Add changes file for 3.6.1Eike Ziller2016-03-081-0/+61
| | | | | Change-Id: If31dcec2a68ed29b565150f136fc1b2554a34235 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* UicCodeModel: Make process killing more robustTobias Hunger2016-03-032-71/+78
| | | | | | | | | | | | | One possible cause for the crash reported in QTCREATORBUG-15672 is that uic is in the process of getting killed while somebody else already starts a new instance. So this patch makes that more robust by using a new QProcess instance for each uic run. Task-number: QTCREATORBUG-15672 Change-Id: Ibf4feda4fd783fbcadbdbbed30edeb0ff3c85871 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Fix translations of JSON based wizards.Eike Ziller2016-03-021-1/+1
| | | | | | | | Used inconsistent translation contexts. Task-number: QTCREATORBUG-8945 Change-Id: I59d1370501438f4ca00cd801cb6f2803a5ada9b7 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Increment IDE_YEARRobert Loehning2016-03-021-1/+1
| | | | | Change-Id: Ib7008eddf6c638e04711158dcb3543c3d992d7ee Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* QmlProfiler: Limit hard resetting of QML debug connectionUlf Hermann2016-03-011-8/+13
| | | | | | | | | | On windows it can take a long time to establish the connection. On OSX we want to throw away the first connection after trying for 200ms. We don't want to introduce #ifdefs here, so after throwing away two connections stick to the third one. Change-Id: I407120244747ac39429786e371c93a7d1e29933d Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* QmlProfiler: Check runConfiguration for 0 before accessing itUlf Hermann2016-03-011-9/+11
| | | | | | Change-Id: I274d7a75313a899a2b0c05fddbe8e189f9b99156 Reviewed-by: hjk <hjk@theqtcompany.com> Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* ApplicationLaucher: Catch late WinDebug messagesTobias Hunger2016-02-292-5/+18
| | | | | | | | | | | | Catch and display messages received from WinDebug interface, even for a short while after the process has already finished. This can apparently happen, e.g. when doing a qDebug right before the application ends (and QT_LOGGING_TO_CONSOLE is not 1, the application is being run in GUI mode, on windows). Task-number: QTCREATORBUG-15546 Change-Id: I37a015da89fc409234adeb597171fa328f50c14d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* QMake: Fix layout of qmake makestepTobias Hunger2016-02-261-15/+9
| | | | | | | | | | Use a gridlayout in favor of a formlayout. That increases the minimum size of the widget. Task-number: QTCREATORBUG-15793 Change-Id: Iac6be373f6bdbc5e9384e2713db57bfc38f0432c Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Squish: Remove unused objectRobert Loehning2016-02-251-1/+0
| | | | | Change-Id: I65021379b27803ea1d38f554348b24e210fb0c8b Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Improve German translationRobert Loehning2016-02-241-2/+2
| | | | | Change-Id: I46e0c7f3b047d55db1fa2abe54c701c208de50ba Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Beautifier: Fix format for clang-format's command line style parameterLorenz Haas2016-02-241-2/+10
| | | | | | | | | | | clang-format uses YAML for its configuration file. Thus the content has to be properly reformated when used in a single line as command line argument. Task-number: QTCREATORBUG-15604 Change-Id: I867caf7ccb1f2f396677e2d0cd5335e5255e03ea Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* Debugger: Fix switching between threads not updating stack pane.Alexandru Croitor2016-02-241-5/+1
| | | | | | Task-number: QTCREATORBUG-15587 Change-Id: I41b2025e26d79ca0acf12d8d6468786f5dd121b2 Reviewed-by: hjk <hjk@theqtcompany.com>
* Fix qtcreator.sh for the new Qt deployment necessary with Qt 5.6Eike Ziller2016-02-221-1/+11
| | | | | | | | | | | We need to deploy Qt 5.6 into its own directory (lib/Qt/) in the Qt Creator packages, so the LD_LIBRARY_PATH that is set in qtcreator.sh needs that too. Task-number: QTCREATORBUG-15748 Change-Id: I637322dfe5eb669b6447aa2f2b52e3ba2fe2979f Reviewed-by: Edward Welbourne <edward.welbourne@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Update qbs submodule.Christian Kandeler2016-02-221-0/+0
| | | | | | | To HEAD of 1.4 branch. Change-Id: I78d92360ebd6bbf347584e30468ade40f2ce4843 Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
* Fix qtcreator_process_stub "cannot obtain a handle to the inferior" issue.Michal Policht2016-02-181-3/+5
| | | | | | | | | | | | Don't close the process/thread handles, so that the kernel doesn't free the resources before ConsoleProcess is able to obtain handles to them - this would be a problem if the child process exits very quickly. Also remove the superfluous free(env) for consistency. Task-number: QTCREATORBUG-13042 Change-Id: Ie25eeab71cd9dfd69831c37e4f02477446486309 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* SessionManager: Fix possible crashes in session managerTobias Hunger2016-02-171-2/+2
| | | | | Change-Id: Icd97c765fb4d5b88ff2986b927433e2583817605 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Squish: override startApplication in startCreatorTryingClang()Robert Loehning2016-02-161-0/+1
| | | | | Change-Id: I6cb16c2a93ca46503f056c558eb8a6a2b33153d7 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Squish: Test overwriting of files when adding classRobert Loehning2016-02-162-3/+37
| | | | | Change-Id: I86ed9a3749f692fe9ead13c31e0ba62c2baa3020 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* proparser: Make compileKevin Funk2016-02-151-1/+1
| | | | | Change-Id: Ifb96fd11f542f9622ea3867c3bf877e722120136 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Squish: Include binary editor in testsRobert Loehning2016-02-156-18/+28
| | | | | Change-Id: I0b4fc4e0cb18dcbd569ebdba201bfb9e2596ba5b Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Squish: Use existing tools for finding executablesRobert Loehning2016-02-151-29/+8
| | | | | Change-Id: Ic3e7f5db6d12e37f908df3290893768a5be4fa56 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Squish: Stabilize tst_CSUP06Robert Loehning2016-02-151-3/+9
| | | | | Change-Id: I52f4c858f178cb3018e57461e2350564fbf78024 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Update qbs submodule.Christian Kandeler2016-02-121-0/+0
| | | | | | | To HEAD of 1.4 branch. Change-Id: Ia56b692563848cf27db89b30bfd3439840a4dc41 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* CppTools: Do not clear project state on session unloadNikolai Kosjar2016-02-122-14/+1
| | | | | | | | | | | | | | | Affected functionality was, among others: * Getting the correct project part when opening a file * Fallback project part (merged defines/includes) not up to date * Fallback for "Switch Header/Source" not up to date In the early days sessions switching was probably implemented by "close all projects of session X, open all projects of session Y". That's not the case anymore today. Change-Id: I4c6a80e2eb219615d3ea6fcf07be7c05072c8832 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Cdbext: Fix QString dumper.David Schulz2016-02-091-2/+4
| | | | | Change-Id: I437e01c4408c3a5052d0b78c1c75de545f541a7e Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Update qbs submodule.Christian Kandeler2016-02-051-0/+0
| | | | | | | | To HEAD of 1.4 branch. Change-Id: I42a6d9dc47a2088a62451ea42a9cf1b0ee50e08d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Squish: Try to stabilize tst_qml_js_consoleRobert Loehning2016-02-031-0/+2
| | | | | Change-Id: I9de2d7784954ebe658530505ba64e816a95d411c Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* sqlite: Fix qbs build.Christian Kandeler2016-02-021-1/+2
| | | | | | | Qt 5.6 no longer pulls in the pthread library. Change-Id: I2059990ba55389e6f5cfe471e15bfc56920a7a5f Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Squish: Increase timeout in tst_git_first_commitRobert Loehning2016-02-021-1/+1
| | | | | Change-Id: Id65b729cd200bb37ad132b4071a263ab61bb3ed8 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* README.md: Add some Windows/Clang instructions.Friedemann Kleint2016-02-021-4/+15
| | | | | Change-Id: I3c854d7a932951d8340507c4799591bbccb179ef Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* Clang: fix compile errorNikita Baryshnikov2016-02-021-1/+2
| | | | | | | | | | avoid adding -L/usr/lib to linker options. To avoid linker errors with Qt from system and from own toolchain. Change-Id: I291943e6b17c2bf17eb0700b0fc0cda435588ad5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* Editor: Fix compiling of editor overlay.David Schulz2016-02-021-2/+2
| | | | | | | Introduced by 0532c947587f246fda285253788e1fcbf5da1ef6 . Change-Id: Ia10c09a44012649ffab4fa35d0f1ac20d2233474 Reviewed-by: hjk <hjk@theqtcompany.com>
* Editor: Avoid using private text document handle.David Schulz2016-02-021-2/+4
| | | | | | Task-number: QTCREATORBUG-15238 Change-Id: I6c7636ac4762c48c53767beaa97b0ce567f87dd1 Reviewed-by: hjk <hjk@theqtcompany.com>
* TextEditor: Revert adaptation to reverted QTextCursor API change.Christian Kandeler2016-02-011-9/+0
| | | | | Change-Id: I1f778f6389adc6937330b727006ad89880328cb5 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* ClangBackEnd: Use QCommandLineParser.Friedemann Kleint2016-02-011-5/+19
| | | | | | | | Output a proper usage message instead of a cryptic "wrong argument count" when launching it from the shell for testing. Change-Id: Iedb6b1062c9d246a514aefb05220942e4a6341df Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
* Squish: Run tst_CSUP01 on clang code model, tooRobert Loehning2016-02-012-43/+55
| | | | | Change-Id: Ic2424cc9d962feff06baadc23a5fdf121bf2a11d Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* MsvcToolChain: Detect Microsoft Visual C++ Build Tools.Friedemann Kleint2016-02-011-0/+41
| | | | | | | | | Check the standard installation location of the Microsoft Visual C C++ Build Tools introduced with MSVC2015 for the presence of the bat file and add the toolchains. Change-Id: Ia2b7770ed50c51132c88330ff1448900b0b06c1e Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Core: Remove dependency on gui-private againhjk2016-01-291-1/+1
| | | | | Change-Id: Ia4a716e3cccb0accac9c1998a854824195c3583e Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Find: Remove use of unsual QTextCursor constructorshjk2016-01-291-11/+4
| | | | | | Change-Id: If3b86d49c5b87974f7d40fcfa75e4a303ba55c1a Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> (cherry picked from commit 1edd6193ba1bdf39c70e071bc267960b6387863e)
* Add qmake-generated wrapper scripts to .gitignoreEike Ziller2016-01-281-0/+4
| | | | | Change-Id: Idb82c78436335db70bc6caf906b9aa1ea212c68b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* TextEditor: Show new zoom factor when resettingRobert Loehning2016-01-281-5/+12
| | | | | | | ...mainly to not show the old zoom factor anymore. Change-Id: I01c3050ff38b0b328774e6d05bcc2fe913ee4f56 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Update Russian translationSergey Belyashov2016-01-271-61/+11
| | | | | | Change-Id: I20b894139b8d21b3c90c018a4866f96b6c45ac33 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Fix compile for Qt5.4Christian Stenger2016-01-252-0/+4
| | | | | | | Introduced with f443c95dcc49f0846fc2bee5bd2ccbcac4e4b1d5. Change-Id: I6fcc2c429b90cb56a02c3c63f0788fcf0ab1df52 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Adapt to QtGui changes that broke private API source compatibilityThiago Macieira2016-01-224-2/+17
| | | | | | | | | The public constructors in QTextCursor that were private API are no longer public. Task-number: QTCREATORBUG-15238 Change-Id: I3bc59670b62d4afaa645ffff1411b76029249840 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Update German translationRobert Loehning2016-01-221-6216/+5624
| | | | | | | Task-number: QTCREATORBUG-14670 Change-Id: Id5ea3791a5c6a0ed3c25291504c3f9bb5d30a190 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com> Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
* Squish: Update tst_qml_editor to use Qt 5Robert Loehning2016-01-212-20/+24
| | | | | Change-Id: I1f2c8b9212ab2b1eec07a4587495aaf02d201523 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Squish: Test clicking on unknown git commit idRobert Loehning2016-01-211-5/+28
| | | | | | Task-number: QTCREATORBUG-15051 Change-Id: I9046fe8279a661a5ba28bd14747a9ee9915c3416 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* No need for -lrt and -ldl on OpenBSDCaspar Schutijser2016-01-204-4/+4
| | | | | | | Change-Id: I33b29016daa950ab88632ffbc5cf54dde4c6eafa Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
View Lorry Controller Status