summaryrefslogtreecommitdiff
path: root/src
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>
* License updateEike Ziller2014-10-094271-29669/+33892
| | | | | 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>
* 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>
* 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-293-0/+3
|\ | | | | | | Change-Id: I5d9b1d71eea5ffaed36477d73915f4a4fb4ab90c
| * Fix the build: add missing #includes3.1Thiago Macieira2014-08-183-0/+3
| | | | | | | | | | | | | | | | | | <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>
* | 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>
* | 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>
* | 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>
* | ios: simulator integration support for Xcode6Fawzi Mohamed2014-09-176-16/+596
| | | | | | | | | | Change-Id: Ibe161281e7dcdbba2c19fb23fac0546f2e592ad2 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@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>
* | Update qbs submodule.Christian Kandeler2014-09-111-0/+0
| | | | | | | | | | | | | | To HEAD of 1.3 branch. Change-Id: I474a2cdfbc99a82cd075ee785d2530a8a5f012e4 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | SSH: Do not always emit an error if an SFTP channel exits.Christian Kandeler2014-09-111-0/+3
| | | | | | | | | | | | | | | | Channel exit is completely normal if we closed the channel, so this must not cause an error message. Change-Id: I57f5165b339a52a25118ad5e357f41334dadebc4 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | SSH: Fix maximum packet size check.Christian Kandeler2014-09-111-3/+5
| | | | | | | | | | | | | | | | The statement in the RFC was misunderstood. Task-number: QTCREATORBUG-12884 Change-Id: Icd533362ebf95d963cacc8d11da03360e742f070 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | QmlDesigner.PropertyEditor: Fix regression in SliderSpecificsThomas Hartmann2014-09-111-1/+1
| | | | | | | | | | Change-Id: Id71d3ec192a030ead81bb7746681b18cb9d79e27 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | QmlDesigner.Instances: Do not use Qt kit for fallback puppetThomas Hartmann2014-09-111-1/+2
| | | | | | | | | | Change-Id: I825c7f2380a376b30cc647942aa7d252aa9d36df Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Doc: fix labels and tooltipsLeena Miettinen2014-09-112-14/+14
| | | | | | | | | | | | | | | | Fix capitalization, punctuation and typos, and remove unnecessary text. Change-Id: Iee39e465125d5d9eec099323fb7d75756c8d81df Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | ClearCase: Initialize checkout dialog after sync has finishedOrgad Shaneh2014-09-101-5/+6
| | | | | | | | | | | | | | | | If it is initialized too early, activities combo is empty. Change-Id: I6ca34e7bcae5d9960b1f84cd3f95ce13ae45ccca Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Only insert SideBarWidget for existing idThomas Hartmann2014-09-101-1/+2
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-12974 Change-Id: I69cacab32de0454a78c5a67edcc7dcbbdcb12784 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | QmlJS: Add error message for invalid root item in the designerThomas Hartmann2014-09-104-0/+26
| | | | | | | | | | | | | | | | | | Documents with those types do crash the qmlpuppet and confuse the users. With this patch we give a clear error message and such files are not supported anymore. Change-Id: Iba19def2751d4dc81d90684c0c63c0274fdf49cf Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* | QmlDesigner: Adding UI option for fallback puppet.Thomas Hartmann2014-09-103-27/+48
| | | | | | | | | | | | | | | | | | This patch adds an option to configure the usage of qml(2)puppet. By default the qml(2)puppet that comes together with Qt Creator is used. Change-Id: Idada8457e81fa17d3290dc97ded303aab475a9f3 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | QmlDesigner.TextToModelMerger: Fixing comparison of QVariantThomas Hartmann2014-09-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | n the case of custom types, their equalness operators are not called. Instead the values' addresses are compared. This is not want we want. Instead we have to cast and compare our custom types manually. This fixed a couple of QTC_ASSERTS. Change-Id: I3a82b84744f9b8860b7efaeb203475bb9dba5d11 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | QmlDesigner: add more specificsTim Jenssen2014-09-097-62/+266
| | | | | | | | | | | | | | Fix: QTCREATORBUG-12798 Change-Id: I8d36bb4ccae05cdb28833317d74a06e7628540a1 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | QmlDesigner.Navigator: Fix reordering in case of invisble nodesThomas Hartmann2014-09-083-30/+7
| | | | | | | | | | | | | | | | | | | | If the model contains nodes that are invisible in the navigator (e.g. QtObject) updateItemRowOrder() does not work correctly. To avoid complexity we update the subtree in this case. Change-Id: Ia40ce061e9188ef9ad6ca54ce3444432b878ddf6 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | QmlDesigner.Navigator: Crash fixThomas Hartmann2014-09-081-1/+3
| | | | | | | | | | | | | | | | | | Objects which are not an Item are not visible in the tree view. In this case model() is 0 and Qt Creator was crashing when detaching the navigator view. Change-Id: I144c940d76157defb27133673ed911d733d8b5ef Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | QmlDesigner: Fix regression for import pathsThomas Hartmann2014-09-0810-33/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The imports paths used by the sub component manger and meta info system were not correctly resolved. The main reason was that the textDocument in the text modifiers are just plain text buffers and do not containt any url for the document. This patch removes importPaths() from the TextModifier. The ViewerContext can be stored in the TextToModelMerger and does not have to be recreated when needed. Change-Id: I17281caee23ddd51f6e36d5346bc3bd7c53005e8 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* | qmljs: highlight properties with inline qml componentsFawzi Mohamed2014-09-081-1/+6
| | | | | | | | | | | | Task-number: QTCREATORBUG-10892 Change-Id: Ifbf5675ab53de54f6f38c07726f5ad400f6ee9d6 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | qmljs: always add environment paths to the qml vContextsFawzi Mohamed2014-09-081-0/+7
| | | | | | | | | | Change-Id: Ib2c0650aa4dcf1b5365c8521e5145003faf216ac Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Fixed font deployment for winphone 8.0Oliver Wolff2014-09-051-3/+19
| | | | | | | | | | Change-Id: I8d7a2debfec3bbd06780458a29f11031dd9b862c Reviewed-by: Andrew Knight <andrew.knight@digia.com>
* | Fixed creation of mapping files for winphone 8.1Oliver Wolff2014-09-051-10/+21
| | | | | | | | | | Change-Id: I42f97f8f629b6ffbf48a01409605853f60a9c02b Reviewed-by: Andrew Knight <andrew.knight@digia.com>
* | SdkTool: Fix warningsChristian Stenger2014-09-051-1/+2
| | | | | | | | | | Change-Id: I2a16bdff7b184e0988d9147f01075c87f8eb1309 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | SdkTool: Fix "get" for complex typesOrgad Shaneh2014-09-051-1/+36
| | | | | | | | | | Change-Id: I8dd8101e33da4a2bdb0bf36f4217f1c466583b47 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Fix keyboard selection shortcuts on Qml/JS ConsoleKai Koehne2014-09-041-2/+6
| | | | | | | | | | | | | | Change-Id: I804df07c711de62c6c8e34810aa17a7ed86f2011 Task-number: QTCREATORBUG-12956 Reviewed-by: Aurindam Jana <aurindam.jana@digia.com> Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
* | Editor: Draw column wrap line after drawing ifdef blocksVicken Simonian2014-09-041-19/+20
| | | | | | | | | | | | Task-number: QTCREATORBUG-12940 Change-Id: I431176c1879236bc107a2c1db11890da5d75f750 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Do not build UpdateInfo pluginEike Ziller2014-09-031-5/+5
| | | | | | | | | | | | | | | | It is broken, and people should not even be able to manually enable it. Change-Id: I990922b1a514e43ed7e4b951ee230306e031f942 Task-number: QTCREATORBUG-11262 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* | VariableManager: Hopefully fix crash with int variablesEike Ziller2014-09-031-1/+2
| | | | | | | | | | | | | | | | Capturing const references in lambdas is potentially dangerous. Change-Id: I4b4ddc8dcb1e839e4ed919caccdf0010ed8e6a34 Task-number: QTCREATORBUG-12948 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
View Lorry Controller Status