summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Qnx: Fix the Id for the BlackBerry run configuration3.2El Mehdi Fekari2014-10-201-1/+1
| | | | | | | | | cherry-pick of 3043dc73beca574b83f2bce506a659d2dc1a437a Task-number: QTCREATORBUG-13108 Change-Id: Ia30bf3738ed85fd350a5f3821ec6b27f654b5dd2 Reviewed-by: Sergejs Kovrovs <kovrov@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Squish: Improve READMERobert Loehning2014-10-131-4/+3
| | | | | Change-Id: Id9270613c4760e02af55afc070972a92da56c130 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Update Russian translationSergey Belyashov2014-10-101-0/+102
| | | | | | Change-Id: If1782c8501353cb953a17f8be43abec987b67e94 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Add changes file for 3.2.2v3.2.2Eike Ziller2014-10-101-0/+42
| | | | | Change-Id: Ibb20ea1a28681bb1037e941c1dd2c2d5575b9513 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Squish: Revert unintended change in expected filesRobert Loehning2014-10-091-2/+1
| | | | | | | | | | This table refers to the contents of v3.2.0. Reverting change in 8295b503be90c60a8a7e9b722357352917406078 Change-Id: Ic3cd6fcf6a318745c83e871b4d9b6ae109b05813 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Squish: Stabilize tst_CSUP03Robert Loehning2014-10-091-0/+1
| | | | | Change-Id: Id90b102d926c90e53c3a8a610ac464cb6876dc5d Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Squish: Fix expected treeChristian Stenger2014-10-091-2/+0
| | | | | | | On Windows valgrind autotests are disabled. Change-Id: I86323eba3d08e7ef245e1bcfbd799fce8ad29b9e Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* License updateEike Ziller2014-10-094902-34017/+39210
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* CMakeProjectManager: Fix crash on selecting make targetDaniel Teske2014-10-081-1/+1
| | | | | | Task-number: QTCREATORBUG-13129 Change-Id: Ie964e547809ee7626c526a6a3f5741f19b8a2f0f Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Update qbs submodule.Christian Kandeler2014-10-072-3/+2
| | | | | | | And do the required adaptation in QbsProjectManager. Change-Id: Ib383ebf99ceb638a545158d426769bf963086a1a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Android: Be more careful in androidVirtualDevices()Daniel Teske2014-10-021-7/+24
| | | | | | | | | | The backtrace in QTCREATORBUG-13081 suggest that something with dev.serialNumber is wrong. The input (attached to the bug report) does not indicate why we would misparse it. So add checking code to all places where we index into line. Change-Id: Ic8e4afb763dc1c899e9a1d0503d6494e2aea1223 Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Squish: Refactor and improve tst_CSUP01Robert Loehning2014-10-021-30/+30
| | | | | Change-Id: I154ebcc01a870b0bf3912a69b37184fd2f37092a Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Squish: Remove further unstable lines from project treeRobert Loehning2014-09-301-6/+0
| | | | | Change-Id: I985fcce7297fe6508514c0476a16553905063c11 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Update qbs submodule.Christian Kandeler2014-09-301-0/+0
| | | | | | | To HEAD of 1.3 branch. Change-Id: I8594101d87130eab8e5abdbf288ffe119bdec1d2 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Core: Revert function signature changeOrgad Shaneh2014-09-302-2/+2
| | | | | | | | | Breaks BC with MSVC2010. This partially reverts commit fe8ed7f5a666629ae43f8fc0888484a8bfa3b210. Change-Id: I36f995f992f3d12f16900c6dbe1dc94123c188bd Reviewed-by: hjk <hjk121@nokiamail.com>
* Squish: Remove unstable lines from expected project treeRobert Loehning2014-09-301-6/+0
| | | | | Change-Id: I76bed181ec12257cf264c13660867b151d844747 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Re-add Label for action JumpToFileUnderCursorInNextSplit.marcel2014-09-291-1/+1
| | | | | | | The label got lost in f1eb9c4827670a56a5f772575d7f4a1d1f9cd26f Change-Id: Idedbc471a2ea6104e900d626ff7b424d51092624 Reviewed-by: David Schulz <david.schulz@digia.com>
* Generic Project: Fix adding wrong include directoriesAndre Hartmann2014-09-291-2/+2
| | | | | | | | Task-number: QTCREATORBUG-12727 Task-number: QTCREATORBUG-12873 Change-Id: I1dffad5af9ac254fa17f89291db7baf640ed1851 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Merge remote-tracking branch 'origin/3.1' into 3.2Eike Ziller2014-09-294-0/+4
|\ | | | | | | Change-Id: I5d9b1d71eea5ffaed36477d73915f4a4fb4ab90c
| * Fix the build: add missing #includes3.1Thiago Macieira2014-08-184-0/+4
| | | | | | | | | | | | | | | | | | <QWidget> for QWidget, <QDataStream> for QDataStream and <QMetaObject> for Q_GADGET (technically, qobjectdefs.h) Change-Id: Ia7e8b12ff4c67827bb7782a0337714e330de1db1 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* | Perforce: Disable actions when outside a repository.David Schulz2014-09-291-14/+30
| | | | | | | | | | | | Task-number: QTCREATORBUG-13092 Change-Id: I3d059af748f0160ebfc97bebbd43de9210f17250 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | Squish: Do not crash tst_simple_debug if debugger can't stopRobert Loehning2014-09-262-0/+6
| | | | | | | | | | Change-Id: Iedf0335088739ed60f321b6479711298067f9038 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | Session: Fix compilationRobert Loehning2014-09-261-4/+4
| | | | | | | | | | | | | | This was broken in fe8ed7f5a666629ae43f8fc0888484a8bfa3b210 Change-Id: Iff4dffa6ba6cfdeeb3664c026ce642b80e4deeeb Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | Session: Fix saving session data on shutdown from project modeDaniel Teske2014-09-263-5/+6
| | | | | | | | | | | | | | | | This was broken in d52ee686d1ae63090e066faf4e2b66b90620b774. Task-number: QTCREATORBUG-13098 Change-Id: Ia075e13fdd00e561b78058a3cab0cb02d2eb5fe6 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Debugger: Fix QHash display of "compact" keyshjk2014-09-266-39/+59
| | | | | | | | | | | | | | | | Add make std::string usable as "compact" key. Change-Id: Idbfcf9d299e2dde392025166a20c3d0ab60239a6 (cherry picked from commit 2776536a7efd6758de1d6720b2c05a9fe0bc65a5) Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | Squish: Run tst_memberoperator with Clang code model, tooRobert Loehning2014-09-251-17/+29
| | | | | | | | | | Change-Id: I3b4b2ed3523e94d5a6dee6957b5b16d4092122fd Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | Squish: Run tst_CSUP05 with Clang code model, tooRobert Loehning2014-09-252-48/+54
| | | | | | | | | | Change-Id: Ief81ba27d8cbd43de5ef9c71b586da8cc372a8bb Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | Squish: Run tst_CSUP04 with Clang code model, tooRobert Loehning2014-09-251-32/+36
| | | | | | | | | | Change-Id: I3a2f029e0f1c85ecbd3c161b097f4e975014f714 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | Squish: Run tst_CSUP03 with Clang code model, tooRobert Loehning2014-09-251-32/+39
| | | | | | | | | | Change-Id: I5b240b2fbd7999b2228871ddf8faa72509c49465 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | Squish: Add shared file for clang-related codeRobert Loehning2014-09-253-43/+91
| | | | | | | | | | Change-Id: I2eaa39afbfeb0031f191ce9adead80c0d0960542 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | TextEditor: Only disable block selection when we have one.David Schulz2014-09-241-1/+2
| | | | | | | | | | | | | | | | This reduces unnecessary calls to ensureCursorVisible. Task-number: QTCREATORBUG-12860 Change-Id: Iaf59642f3cee645f75d5319d3f6adc236b3f2ee2 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | iossim: correct bring to front for Xcode 6Fawzi Mohamed2014-09-231-4/+13
| | | | | | | | | | | | Change-Id: I7e161a20a4b24635df4f6f373966c7e52cfb593b Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* | Debugger: Wiggle LLDB startuphjk2014-09-231-1/+4
| | | | | | | | | | | | | | | | | | | | LLDB 320.* from XCode 601 was unhappy. This is an trial-and-error to get it start up again. Change-Id: I5dda0eef785d70abbb5798c3884ace89a8426969 (cherry picked from commit 1af0f77ea9c4cc6407dc193f53023c103e827168) Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Make compile with Qt 5.4Kevin Funk2014-09-222-5/+15
| | | | | | | | | | | | | | | | Partial backport of 5da75dba065df3a16d2c58fcd89027750b34f12f Change-Id: I5d0964818934a2a0fc57c97b229469fd5a6c8131 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* | Locator: Fix the fix of the deadlockEike Ziller2014-09-222-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The all/current project searches use metacalls on the UI thread to work around thread-unsafety of the Project::allFiles method, so we cannot jus t block the UI thread to wait for the old search to cancel. On the other hand, many of the ILocatorFilter::matchesFor implementation s do not work when they are run in multiple threads simultaneously (most implementations access unguarded member variables, help index filter tend s to crash), so we _do_ have to wait for the search to cancel before sta rting a new thread. Broke with 05c267673f43ecbb0ae4c44adc7d02a690435f8b and 6fc39f0c41c248be 00c5673ae80d03d115bf3739 Change-Id: I93c607c879e8ba6ef60f94719812edb3df43a154 Task-number: QTCREATORBUG-12875 Task-number: QTCREATORBUG-12592 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | CppEditor: Fix isValidAsciiIdentifierChar.David Schulz2014-09-221-1/+1
| | | | | | | | | | | | Task-number: QTCREATORBUG-13012 Change-Id: I70d45dcdc72408d46bea0b78746ab28c17f3b9e3 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* | CppTools: Fix compilation with recent gcc 4.9.2Orgad Shaneh2014-09-192-15/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=62224 .obj/release-shared/cppcodemodelinspectordialog.o: In function `CppEditor::Internal::CppCodeModelInspectorDialog::refresh()': cppcodemodelinspectordialog.cpp:(.text+0x79fc): undefined reference to `CppTools::Internal::CppModelManager::ensureUpdated()' .obj/release-shared/cppcodemodelinspectordialog.o: In function `CppTools::Internal::CppModelManager::definedMacros()': cppcodemodelinspectordialog.cpp:+0x26): undefined reference to `CppTools::Internal::CppModelManager::ensureUpdated()' .obj/release-shared/cppcodemodelinspectordialog.o: In function `CppTools::Internal::CppModelManager::headerPaths()': cppcodemodelinspectordialog.cpp: +0x26): undefined reference to `CppTools::Internal::CppModelManager::ensureUpdated()' Change-Id: Ie0e01f7628668cbbe11b701a93caef98bb8e335f Reviewed-by: Adam Majer <adamm@zombino.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com> (cherry picked from commit c023a1cac182b44baa8645e8955ef03ed0d31fd7) Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Squish: Avoid crash of tst_CSUP06Robert Loehning2014-09-191-0/+1
| | | | | | | | | | Change-Id: I76318223443ec2e0cc8ddd887a8ac70a6993c0c4 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | Doc: fix link to OS X deployment page in Qt docsLeena Miettinen2014-09-191-3/+3
| | | | | | | | | | | | | | | | And replace some remaining "Mac" or "Mac OS X" strings with "OS X". Change-Id: I8ae1697a23e69fb840890c1d10887ddbe86a3c98 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | ios: simulator integration support for Xcode6Fawzi Mohamed2014-09-176-16/+596
| | | | | | | | | | Change-Id: Ibe161281e7dcdbba2c19fb23fac0546f2e592ad2 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* | German translation for late stringsRobert Loehning2014-09-171-6/+132
| | | | | | | | | | | | Change-Id: I40ab7dc02492d9e71ebb8c209ab645a5bf095c94 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Doc: document QML emulation layerLeena Miettinen2014-09-171-0/+16
| | | | | | | | | | | | | | | | And the new option to have Qt Creator build the emulation layer using the kit selected for the project. Change-Id: I16b3d9e87f21caf7a4ecd1a527df51035494fb34 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | Version bumpEike Ziller2014-09-162-2/+2
| | | | | | | | | | Change-Id: I4262a5ff65f72e11f2bff0f7edae802aba9b1082 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Update Russian translationSergey Belyashov2014-09-151-1968/+2657
| | | | | | | | | | | | Change-Id: I22a16eaae505d43c31516db98290df3ec667b5e0 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Add changes file for 3.2.1Eike Ziller2014-09-151-0/+48
| | | | | | | | | | Change-Id: I43a7d8d5bfcef33ef7e2370cafec3c409fd9ce25 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* | ClearCase: Fix unreserved checkoutOrgad Shaneh2014-09-151-2/+4
| | | | | | | | | | | | Task-number: QTCREATORBUG-12847 Change-Id: I8b42631adf62cd9b6afea619a17bf01a725a2968 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | QbsProjectManager: Turn the timestamp check off by default.Christian Kandeler2014-09-151-1/+0
| | | | | | | | | | | | | | One line was overlooked in a recent patch that intended to do this. Change-Id: I1c344c4e25d47b2c4cc89071c2a4e059b451c9fd Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | QbsProjectManager: Fix crash when calling QbsProject::files().Christian Kandeler2014-09-151-3/+3
| | | | | | | | | | | | | | | | We can't do that during parsing, as qbs::Project::buildSystemFiles() might run into a race condition. Change-Id: Iae3fd3000fdc71fec50c82d50fb3b4e3888351bc Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Editors: sync the layout with the contents before setting text cursorUlf Hermann2014-09-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | Not doing this makes the QPlainTextEdit interact with an invalid layout, potentially causing crashes. Now the cursor setting itself is not part of the undo stack anymore, but as undoing sets the cursor itself, that shouldn't be a problem. Change-Id: Ic6f8ee9781faed655ac20f058b562c098ced20ae Task-number: QTCREATORBUG-12987 Reviewed-by: hjk <hjk121@nokiamail.com>
* | Scripts: Fix deployment of qmlpuppets on OSXv3.2.1Christian Stenger2014-09-121-2/+2
| | | | | | | | | | Change-Id: Ic312423ff7d79b652379d7512a75be043a33740b Reviewed-by: Eike Ziller <eike.ziller@digia.com>
View Lorry Controller Status