summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge remote-tracking branch 'origin/4.1' into 4.2Eike Ziller2016-10-241-2/+0
|\ | | | | | | | | | | | | | | Conflicts: scripts/deployqtHelper_mac.sh src/plugins/ios/iostoolhandler.cpp Change-Id: I06219e1c137e8f58f295da423363360457fa0b11
| * Remove deployment of iossim toolVikas Pachdha2016-10-201-2/+0
| | | | | | | | | | | | | | iossim tool no longer exists and it is replaced by Xcode's simctl tool Change-Id: I4f4dbdc8b8e91663109c289b75a21dd92d966018 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * Revert "iOS: Replaced deprecated signal QProcess::error. Fixes compilation ↵Christian Stenger2016-10-181-2/+4
| | | | | | | | | | | | | | | | | | | | | | issues with GCC" This reverts commit a9f00a2da3d71fd365e93141527cfb755b8de75b as this commit uses functions that are available from Qt5.6 onwards but we still have Qt5.5 as minimum requirement. Change-Id: Ice16d4faeb3417dc80431299b308b37ab2b56c1f Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | compile fixTim Jenssen2016-10-211-0/+1
| | | | | | | | | | Change-Id: Idb8e01dc2895621cf94ba047a41eef5ca0474089 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner.PropertyEditor: Fixing url editorThomas Hartmann2016-10-211-5/+15
| | | | | | | | | | | | Task-number: QTCREATORBUG-11380 Change-Id: I00cdcc8626e2e178b9fff8d11b26f87d9aad03a8 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: refactor indent featureTim Jenssen2016-10-216-29/+39
| | | | | | | | | | | | | | | | * add indentLines() method * refactor indent to use indentLines() Change-Id: Ie36c7ab6217c31e9e3913a4dd5da2196364200c8 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* | QmlDesigner: add getLineInDocument() for convenienceTim Jenssen2016-10-212-0/+10
| | | | | | | | | | Change-Id: I34f788e320fe4c38e3dbb55ba6d0bc1b8d9ba59a Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* | QmlDesigner: space only cleanupsTim Jenssen2016-10-213-2/+2
| | | | | | | | | | Change-Id: I959208b27694ff3c75650a3f482a0a975ca6e769 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* | Clang: Fix using forward slashes for CLANG_RESOURCE_DIR in qbsNikolai Kosjar2016-10-211-2/+2
| | | | | | | | | | | | Change-Id: I251567529ec33ef76043006c68749724208cc811 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | clangcodemodel: Use forward slashes for CLANG_RESOURCE_DIR defineFriedemann Kleint2016-10-212-3/+5
| | | | | | | | | | | | | | | | | | | | Adapt qmake and qbs files, fixing warnings on Windows: clangutils.cpp(78): warning C4129: 'o': unrecognized character escape sequence clangutils.cpp(78): warning C4129: 'L': unrecognized character escape sequence clangutils.cpp(78): warning C4129: 'l': unrecognized character escape sequence Change-Id: I7a5fe674665437582457645f2a081e1e38d5df77 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | ClangStaticAnalyzer: Tests: Change target only if necessaryNikolai Kosjar2016-10-211-8/+10
| | | | | | | | | | | | | | ...otherwise we wait for nothing. Change-Id: Ia55d4845f8dd0fe746ee6c8ca19b5312879294d1 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Clang: Clear left-over preambles after crashNikolai Kosjar2016-10-212-3/+14
| | | | | | | | | | | | | | | | ...otherwise they accumulate in the temporary directory. Change-Id: I0841f3d168f30f559fc718d2825dd3e800515074 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | DiffEditor: fix revert chunk for diffs of modified filesJarek Kobus2016-10-217-18/+81
| | | | | | | | | | | | | | | | | | Apply chunk action doesn't make sense for that case, will stay disabled. Task-number: QTCREATORBUG-17136 Change-Id: Idce31b3aa9d354536a01607c10b20273158961d5 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Reuse the Guard classJarek Kobus2016-10-213-27/+17
| | | | | | | | | | Change-Id: Ia742ab92fd7947f4d156d03e112ee32363312996 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Use namespace Core in diff editor pluginJarek Kobus2016-10-211-37/+39
| | | | | | | | | | Change-Id: I2409a6186d590a83ccde064c855e0261d600014e Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Handle "Diff All Modified Files" action enablementJarek Kobus2016-10-214-46/+56
| | | | | | | | | | | | | | | | Also rename it to "Diff Open Files". Task-number: QTCREATORBUG-17094 Change-Id: I370c32497fcb56cb2bd84700ef7cb4aa7ba0a573 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Implement diff on close, on revert and on external modificationJarek Kobus2016-10-2111-17/+243
| | | | | | | | | | | | Task-number: QTCREATORBUG-1531 Change-Id: I8c9a740d66eb7836b3df6850ac243260fd282b32 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Fix marking files modified externally as modifiedJarek Kobus2016-10-218-12/+220
| | | | | | | | | | | | | | | | | | It replaces 59c90e00c1e8b18d120f5b5c15b331b1ee427ace and d0c537ca759aa7facfdd0efedac5f5385d16ddb9 Task-number: QTCREATORBUG-17048 Change-Id: Ief4b1b72f2e5e7b1711be05d4ea8c03bbbf48fdf Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Revert "Replace virtual isModified method with a getter/setter/notifier"Jarek Kobus2016-10-2129-116/+136
| | | | | | | | | | | | | | | | | | | | This doesn't fix the issue with cleaning the clear state of undo stack. This introduced the issue when ui file is opened it's marked as modified. It reverts 59c90e00c1e8b18d120f5b5c15b331b1ee427ace and d0c537ca759aa7facfdd0efedac5f5385d16ddb9 Change-Id: Ifd4ff8483d6c297461632de500a4502b1fd0871f Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Clang: Fix typoNikolai Kosjar2016-10-211-1/+1
| | | | | | | | | | Change-Id: I1b1a59dbe041134aad3bc582b77acafa8e67e427 Reviewed-by: David Schulz <david.schulz@qt.io>
* | Clang: Log messages with time stampNikolai Kosjar2016-10-211-2/+5
| | | | | | | | | | Change-Id: I0bb56d319328a2773e55609d63b4ac28eea07386 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Clang: Shorten output prefixNikolai Kosjar2016-10-211-2/+2
| | | | | | | | | | Change-Id: I89a48a2defa4dbee9a0a0f9206ed996ca7cc1538 Reviewed-by: David Schulz <david.schulz@qt.io>
* | QmlDesigner: Fix for item library search filterThomas Hartmann2016-10-213-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this patch the item library gets into an invalid state if the user enters edit mode with an ative search filter. When going back to design mode the item library is completely empty. This patch clears the filter, so the item library gets properly populated. Change-Id: I21f823b8db820589dedd6ba4e4855678fff49e53 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Cdb: Set frame when using the python engineDavid Schulz2016-10-211-0/+2
| | | | | | | | | | Change-Id: Ib84735b58f516dad14c992edba6a0c8e9005ecfc Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Clang: Clean up diagnostic widgetNikolai Kosjar2016-10-215-174/+277
| | | | | | | | | | | | | | | | | | | | | | | | | | * Use a single QLabel - No need for all the QLabels we used. Also, a single QLabel enables selecting and copying all the diagnostics, which is handy when displayed in the info bar. * Avoid call to Utils::ToolTip::hideImmediately() if the location is clicked from the info bar. * Simplify code and API Change-Id: Ib991364e4d6f40ef02dada8ebbb90fe6ff8ae1a1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* | GenericHighlighter: Update from latest KTextEditor sourceOrgad Shaneh2016-10-2116-927/+1134
| | | | | | | | | | Change-Id: I0caf19cd7698c9934655483304314b5653b69f21 Reviewed-by: David Schulz <david.schulz@qt.io>
* | QmlDesigner: cleanup DocumentManagerTim Jenssen2016-10-202-44/+19
| | | | | | | | | | | | | | | | | | | | - move get origin properties out of the static methods to reduce the code hopefully no behavior change Change-Id: Icf903f5bcaf48ab35a9db1a779c6d9e5abcf0f80 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* | Cdb: Add python function returning all template argumentsDavid Schulz2016-10-201-0/+20
| | | | | | | | | | Change-Id: Ib0f2eefc63427c8b89288ec72c35c0596cd6c1d0 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Cdb: Fix getTypeName return value for non existing typesDavid Schulz2016-10-201-4/+6
| | | | | | | | | | | | | | | | | | | | Returning an empty null terminated char[] instead of a nullptr. This fixes usecases where the return value is implicitly converted to a std::string. Change-Id: I5a3985880632a9bcc07765f8b27329bdd1e83347 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* | CdbExt: Version bumpDavid Schulz2016-10-201-1/+1
| | | | | | | | | | Change-Id: Ia51bcb0a313ba43353b3ffe31b38ff42fabd1e8a Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | CMake: forward-declare QDialogØystein Walle2016-10-201-0/+1
| | | | | | | | | | | | | | | | Without this forward declaration compiling cmakekitinformation.cpp yields a compilation error saying QDialog does not name a type. Change-Id: I55066706e9850a947cac47e6e7150928c2fc6c51 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Update documentation for connections editorThomas Hartmann2016-10-206-0/+54
| | | | | | | | | | | | | | | | | | | | We added a new tab called backends. I also updated all the screenshot, so they contain the new tab. Change-Id: Ib66ffbd3a48383f621a482241cde12caef9ca7b4 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | ProjectExplorer: "Build" and "Run" icons for the projects mode treeAlessandro Portale2016-10-191-2/+14
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-17127 Change-Id: I5db19d65eaf7bf69c39ab39bb35e7e4f34e91a6f Reviewed-by: Florian Apolloner <florian@apolloner.eu> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | QbsProjectManager: Do not set an empty compiler nameChristian Kandeler2016-10-191-2/+4
| | | | | | | | | | | | | | | | | | | | If one of the two compiler types in the Kit is not set, leave the respective value in qbs at its default. Things will likely work anyway, whereas setting an empty compiler name is guaranteed to break. Task-number: QTCREATORBUG-17109 Change-Id: I2b4153cb9a9daafb2f57659e16622e00d3921005 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | CppEditor: Native dir separators in ResourcePreviewHoverHandlerAlessandro Portale2016-10-191-1/+3
| | | | | | | | | | Change-Id: I83aaf5a0aff5f679395801ecaccad46a8ff7acb3 Reviewed-by: David Schulz <david.schulz@qt.io>
* | QbsProjectManager: Do not set up generated files for disabled productsChristian Kandeler2016-10-191-4/+6
| | | | | | | | | | | | | | Such products are not guaranteed to have a valid build directory. Change-Id: I3e6ec211edb8fb9a13e3b785cd19b795f7adee12 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Update qbs submoduleChristian Kandeler2016-10-191-0/+0
| | | | | | | | | | | | | | To HEAD of master branch. Change-Id: I5b15266209328623f8df86102481ee9e06ab8fdc Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Doc: Add a step to add connections and bindings in Connections tabLeena Miettinen2016-10-191-0/+6
| | | | | | | | | | | | | | ...in Qt Quick Designer. Change-Id: Ifedb43e73eb868292d31941f432731c27320ca5e Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* | Doc: Use automatic linking to directly link to the type docsLeena Miettinen2016-10-191-2/+1
| | | | | | | | | | | | | | ...in Using QML Modules with Plugins. Change-Id: Icce8e1e2b902e593972bd9f14d118f6a5005ecb8 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* | ScxmlEditor: Themable, HighDPI-able export-canvas iconAlessandro Portale2016-10-185-1/+56
| | | | | | | | | | Change-Id: I966dee7c22903921d814141bc749b39dec7cf8d7 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | ScxmlEditor: Use Utils::Icons::SNAPSHOT_TOOLBARAlessandro Portale2016-10-183-2/+1
| | | | | | | | | | Change-Id: Ic7b873aac60bf07780a11dbcfae10dac6a81035b Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | TextEditor: Improved lightbulb iconAlessandro Portale2016-10-185-4/+10
| | | | | | | | | | | | | | Hopefully now looks more like a light bulb than like an ice cream. Change-Id: Icc27fe786ea0cc1ca8c504ea6e766cb7d54e5050 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Utils: Add a "snapshot" iconAlessandro Portale2016-10-186-0/+46
| | | | | | | | | | Change-Id: Ife531bb493aa22db660e73d9e5b89bc882fac610 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Clang*: Workaround parsing mingw's <type_traits> with clang 3.9Nikolai Kosjar2016-10-185-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | ...for -std=gnu++0x. Define the unknown identifier/type "__float128" so at least the headers can be parsed successfully. Of course this does not help for parsing client code referencing that identifier, but this should be the less common case. Task-number: QTCREATORBUG-17126 Change-Id: Id321311713029d8aa77e068b02361d86debfada6 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Clang: Avoid running into gcc/mingw intrinsicsNikolai Kosjar2016-10-185-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | Same as for the Clang Static Analyzer, so move the implementation into the base class and use it. This has gone unnoticed so far because it looks like that the error diagnostic from the bug report can be extracted with libclang (as shown in the info bar), but is not printed from libclang or clang.exe itself. Change-Id: I5b714ba374c5fdefe234faf012a3515e96c9a08c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Clang: Fix parsing MSVC's crtdefs.h for 64 BitNikolai Kosjar2016-10-189-28/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | ...by specifying the word width, as for the Clang Static Analyzer. This has gone unnoticed so far because it looks like that the error diagnostic from the bug report can be extracted with libclang (as shown in the info bar), but is not printed from libclang or clang.exe itself. Task-number: QTCREATORBUG-17130 Change-Id: Ia7a5ee3825c7211cdf80c2166a9eb454ce48cac1 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | TextEditor: Tweak the refactoroverlay painting for HighDPIAlessandro Portale2016-10-181-2/+3
| | | | | | | | | | | | | | The lightbulb was slightly scaled up on HighDPI. Change-Id: Iea00532ebbf93ce185651ec01364efdbd924a067 Reviewed-by: David Schulz <david.schulz@qt.io>
* | Clang: Use compiler specific undefine optionNikolai Kosjar2016-10-183-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | libclang generated: warning: /U__cpp_aggregate_nsdmi: 'linker' input unused [-Wunused-command-line-argument] warning: /U__cpp_alias_templates: 'linker' input unused [-Wunused-command-line-argument] ... It needs -U. Change-Id: Ibbd2f97e6f806215e3008803f57608b9b6b4c641 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Clang: Fix delayed reparse of dirty and visible but not current documentsNikolai Kosjar2016-10-186-14/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Open document foo.h 2. Create a split and open foo.cpp (#including "foo.h") 3. Edit foo.h (e.g. by introducing a syntax error, so that foo.cpp will indicate header errors in the toolbar or as info bar) => Actual: foo.cpp will be reparsed immediately. Expected: foo.cpp should be reparsed after a delay. This saves resources (cpu time) and minimizes poping up of the header info bar while editing header files in splits. Regression introduced by commit 380d756a03346e5bbb83101f49ed6f6696c42c6a Clang: Hook up supportive translation unit on first edit Change-Id: Ib5fd90e49415dfc3aefacab7cd627b0e1937f5fc Reviewed-by: David Schulz <david.schulz@qt.io>
* | Clang: Remove left-over functionsNikolai Kosjar2016-10-181-26/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | ...that helped modifying the delayed parse timeout. Those are pointless now (at least in the backend) because we have a non-blocking translation unit (except for the first edit) around. The only client using the timer value is currently ClangCodeModelServer::registerUnsavedFilesForEditor - a case for which no configuration should be needed. Change-Id: I0f4171d6ee98bcac229aa5a207b6aa17b336a29a Reviewed-by: David Schulz <david.schulz@qt.io>
View Lorry Controller Status