summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* QmlDesigner: A StateChangeScript can be the child of a StateThomas Hartmann2016-07-011-1/+2
| | | | | | | I found this while testing our demos. Change-Id: I575e1d2f487a2ba137ac8181f4980c30b171f726 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlDesigner: Remove hover effect from tab barThomas Hartmann2016-07-015-12/+0
| | | | | | | | In the property editor there is no hover effect. The hover effect is simply not required. Change-Id: I7e918be7e0ac2186fa02c2cae30ad19e90e8ac75 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlDesigner: Unify the look of the tab barThomas Hartmann2016-07-014-6/+3
| | | | | Change-Id: I2778b959ad75473cbba3639e008a03a105357180 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlDesigner: Adding whitespace to MouseArea in item libraryThomas Hartmann2016-07-011-1/+1
| | | | | Change-Id: I10785a7c5529dfb08575df7bd8865167bfeecd01 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlDesigner: Change caption of tab bar in connection viewThomas Hartmann2016-07-011-1/+1
| | | | | | | | | | Dynamic Properties was to long since we have to set a fixed with for tabs when using css. Properties should be still clear enough and the preserved space imrpoves usability significantly. Change-Id: I484822918d78e89e96c587314bcaeda78c7e95b0 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlDesigner: Remove border radius from .cssThomas Hartmann2016-07-012-6/+0
| | | | | | | This is more consistent with the new flat style and the QML styling. Change-Id: I750620227dc0b79a6518dcef9cfb86986a09cef4 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* RemoteLinux: Use Qt5-style connectsOrgad Shaneh2016-07-0137-145/+151
| | | | | | | The heavy lifting was done by clazy. Change-Id: I1a03435bbb4281bad4ff64baba0182e0050170d6 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* QmlDesigner: Set scrollbar css for dynamic properties viewThomas Hartmann2016-07-011-0/+3
| | | | | Change-Id: If40a106529e4d02b30620c4b885cd5a956acdd5c Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* autotest: Fix warning on missing overrideTobias Hunger2016-07-011-1/+1
| | | | | Change-Id: I93acb387269e6ee02c968bea18f6ce347d18656a Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Timeline: Fix a runtime error messageAlessandro Portale2016-07-011-5/+1
| | | | | | | | | qrc:/timeline/TimelineContent.qml:147: TypeError: Property 'clearData' of object Timeline::TimelineRenderer_QML_135(0x99b4468) is not a function Change-Id: I2adfaa9ad764cde42462de6ebc22a897d3b7a74c Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* WelcomePage: displayName is used and not displayTim Jenssen2016-07-011-1/+3
| | | | | | | | | | | Somehow thought that displayName is already in QAbstractListModel::roleNames(). Also removed unnecessaey default roles. Task-number: QTCREATORBUG-16483 Change-Id: I6651502ee91b20eb1af7e22a67b6b67077ad8aaa Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de>
* qbs build: Replace deprecated constructsChristian Kandeler2016-06-302-6/+8
| | | | | Change-Id: I5a66a5b805b912a8ee752306d6c39759085e98ad Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* QmakeAndroidSupport: Minor cleanupOrgad Shaneh2016-06-302-13/+27
| | | | | | | | Add a helper function that casts the project to QmakeProject. Will be used in the follow-up commit for connecting a slot. Change-Id: I17e23630ac88c117da9bac61dd045f94661e35f0 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Ios: Use Qt5-style connectsOrgad Shaneh2016-06-3019-84/+60
| | | | | | | The heavy lifting was done by clazy. Change-Id: I1b25f0108939d87e859d0407a35f75b88fa0edc3 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Help: Remove unused functionOrgad Shaneh2016-06-302-10/+0
| | | | | | | | Leftover from 5cf2972345171892aca33c6ad784b9a92aa99936. Change-Id: Ia1e7debd3d5e2edeac41bae091d0057fa77a84bc Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Help: Use Qt5-style connectsOrgad Shaneh2016-06-3032-222/+160
| | | | | | | The heavy lifting was done by clazy. Change-Id: Ied9c7fcc031e530c41b342de950e2f0ac730bbb1 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Update qbs submodule.Christian Kandeler2016-06-304-6/+12
| | | | | | | | To HEAD of master branch. Plus some necessary adaptations due to API change. Change-Id: I906918223de3946ae532ae4042c2545dd53b66cc Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Ask before reloading file changed with external editorRobert Loehning2016-06-303-3/+3
| | | | | | | To be consistent with other ways of starting external editors. Change-Id: Ia6f8d2179076482999ef527353feb91a49e1a2d9 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Core: Assign an explicit parent for main editor areaChristian Stenger2016-06-301-0/+2
| | | | | | | | This avoids failing updates of the main window (e.g. windowTitle) before the main editor area is displayed first time. Change-Id: I5c559f9487872e47b1fd914f0aec16b0b2f1dec3 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Git: fix compilationNikita Baryshnikov2016-06-301-1/+1
| | | | | | | | | comparison between QDialogButtonBox and QMessageBox enum values. Introduced here: 34f75be3227ab2fdf12ed106bfa45aa9ddd9d9a4 Change-Id: I19b50e5a4da643e7917346af19170022ffe61f34 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Merge remote-tracking branch 'origin/4.0' into 4.1Eike Ziller2016-06-301-2/+2
|\ | | | | | | Change-Id: Ice4824c6148c8b960f9a61c6685387727627b38d
| * Fix crashes with (Runnable|Connection)::is<T>()Eike Ziller2016-06-281-2/+2
| | | | | | | | | | | | | | | | | | | | Another regression of 3f11ef92167 Default constructed Runnables/Connections have zero d pointer. Task-number: QTCREATORBUG-16507 Change-Id: I230b661eba4c408a353a711f93f3163160980793 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: hjk <hjk@theqtcompany.com>
* | ModelEditor: Zoom with Ctrl + mouse wheelJochen Becher2016-06-294-1/+41
| | | | | | | | | | | | | | Change-Id: I2e703345a882f0dbd80a0957d5f28bd203f4f26b Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> (cherry picked from commit 3e776dde5ebd49db6a0e772b09d931f0333a00ae) Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | QmlDesigner: fix regression from last code cleanupTim Jenssen2016-06-291-2/+2
| | | | | | | | | | | | Task-number: QTCREATORBUG-16516 Change-Id: Ic77d325c131a594f69b6fbbb6b1d6be6374b45a0 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* | QmlDesigner: Making adding signal handlers more user friendlyThomas Hartmann2016-06-294-5/+19
| | | | | | | | | | | | | | | | | | | | The "Go to implementation" context menu was adding a new signal handler if no signal handler was already present. This does not change, but I add "Add new Signal Handler" that always adds a new signal handler, even if one already exists. Change-Id: I7d1f012fda114d22598a9dd650ee14d97d48cd1d Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* | QmlDesigner.MetaInfo: Initiliase property info lazilyThomas Hartmann2016-06-291-6/+47
| | | | | | | | | | | | | | | | | | There exists cases where collecting the properties is very slow. We only have to do this on demand for the property editor. Change-Id: I92d7270481db94655c95ab8d69f373488d841b4e Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* | QmlDesigner: Update qrc filesThomas Hartmann2016-06-292-0/+21
| | | | | | | | | | | | | | This triggers an update on every qrc file. Change-Id: Id34873e3bd8190d79773fbc3a8a90699d4e49cb0 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* | QbsPM: Use Qt5-style connectsOrgad Shaneh2016-06-2921-135/+153
| | | | | | | | | | | | | | The heavy lifting was done by clazy. Change-Id: I841454b0815bc697ae2372dbc6d2caa59d7dc3e8 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | Utils: De-slot and complete Qt5 connectsOrgad Shaneh2016-06-2918-44/+21
| | | | | | | | | | | | | | The only Qt4-style [dis]connects left are in BaseTreeView::setModel. Change-Id: I53bb715750c65827005cc96939a6714606e60f81 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | GenericPM: Use Qt5-style connectsOrgad Shaneh2016-06-292-8/+7
| | | | | | | | | | Change-Id: Ia94373846f0125a42686d6ed69b3111762b00c04 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | QmlJSEditor: Minor cleanupOrgad Shaneh2016-06-291-4/+4
| | | | | | | | | | | | | | Remove unneeded variable, and connect directly to member functions. Change-Id: I2c5077676fc8d3f975d03a71b3e566b692e6b7c6 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | AutoTest: De-slot and complete Qt5-style connectsOrgad Shaneh2016-06-297-22/+9
| | | | | | | | | | Change-Id: I013b42523f163e123a0cee85f9d232815ad284e3 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Debugger: Consolidate icon storage handlinghjk2016-06-2815-183/+188
| | | | | | | | | | | | | | | | | | We settled now on global objects being fine for the purpose in Core and ProjectExplorer, so there's no point in using something more fancy in the debugger. Change-Id: I72e45f398c09d22894419c274dfbea77da0fc153 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Debugger: Clean up debuggerengine.cpphjk2016-06-281-14/+13
| | | | | | | | | | | | | | Some leftover stringfreeze workaround, plus QLatin1*. Change-Id: I5e143af5cda64cb29b7769174187fc86185a89cb Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Qmake: Add Qt:QMAKE_SPEC and Qt:QMAKE_XSPEC expandosTobias Hunger2016-06-281-0/+6
| | | | | | | | | | Change-Id: Ice7e751609503a55ebcd8a488e42feecd0a293c0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Qmake: Update description of Qt:QMAKE_MKSPECS expandoTobias Hunger2016-06-281-1/+1
| | | | | | | | | | Change-Id: Id955967e57c12839dec5a54511662ec92f1e43e5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | QmlJS: Do not try the canonical file pathThomas Hartmann2016-06-281-7/+2
| | | | | | | | | | | | | | | | This is a real bottle neck on Windows and I do not know of a case where it is required. Change-Id: I99ebf3bfdd22cfb0ed82d6d39eeb83f079f654d6 Reviewed-by: Marco Benelli <marco.benelli@qt.io>
* | QmlDesigner: Fix crash in testsThomas Hartmann2016-06-281-4/+15
| | | | | | | | | | | | | | | | In the tests we have cases with no rewriter attached. We warn in these cases. Change-Id: Ibc89ff501bf6d48ed3a2f230ee6e1afda5d4d06c Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Debugger: Make RegisterModel a LeveledTreeModelhjk2016-06-282-4/+7
| | | | | | | | | | Change-Id: I59e7df86e24f4be5c2c69313883fdc182f3071d2 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Debugger: Use a typed root item in ThreadModelhjk2016-06-282-5/+5
| | | | | | | | | | | | | | ... and remove casts where possible. Change-Id: I10305efbe336de7aa5efdb73a52c5f89cd2d089e Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | QmlJSEditor: Fix compile with Qt5.5Christian Stenger2016-06-281-2/+4
| | | | | | | | | | | | | | Avoid using functionality introduced with Qt5.6. Change-Id: Icfa4eeb547b651a19aa745b5de1cb413f9b6b4ef Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | QmlDesigner: Fix regression caused by semantic checkThomas Hartmann2016-06-281-1/+2
| | | | | | | | | | | | | | States can of course contain PropertyChanges. Change-Id: Ie78be1db58c6820a49356b1cd70102e10211030b Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Clang: Honor fixits own locationsNikolai Kosjar2016-06-283-23/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...when showing the refactoring marker and generating the quick fix operations. Opening main.cpp main.cpp: #include "file.h" void f(char *s) { foo(s); } file.h: // significant line 1 // significant line 2 // significant line 3 bool foo(int fd); led to SOFT ASSERT: "textBlock.isValid()" in file clangdiagnosticmanager.cpp, line 205 and a misbehavior when applying the fixit from the tooltip. We take the line of a diagnostic to display the fixit marker if it has any fixits. But the (child) diagnostic might be issued for an other file (that's what happening here), so better take the line of the location where the fixit is meant to be applied. Same applies for generation of the quick fix entries. Change-Id: I48d38420b285d2d2f86e3faa2319513aa8b47848 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* | Merge remote-tracking branch 'origin/4.0' into 4.1Eike Ziller2016-06-2811-30/+68
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/plugins/projectexplorer/runconfiguration.h tests/unit/unittest/unittest.pro Change-Id: I3d327b1198df2a7e9268916af9624ce5d21195df
| * ProjectExplorer: Fix comparison with default-constructed Runnableshjk2016-06-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Regression was introduced with 3f11ef92167. The original check asserting 'that != 0' is still needed without dynamic_cast, as d-pointer of 'other' can be statically 0 for default-constructed Runnable objects. Change-Id: Ibee898ffc61fb2f4a6a6276390fdf6d517fde546 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| * Fix compilation with QT_NO_ACCESSIBILITYEike Ziller2016-06-241-2/+5
| | | | | | | | | | | | Task-number: QTCREATORBUG-16446 Change-Id: If75122c23a697f26ccf56391fe2e8d316aad6367 Reviewed-by: hjk <hjk@theqtcompany.com>
| * Clang: Fix dot-arrow-correction for not-yet-parsed unsaved contentNikolai Kosjar2016-06-244-22/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue was re-producible with e.g.: void g() { // Type 'foo.' as fast as possible in the next line } This led to "foo->" with completion results as if there was no "foo." at all in that line. We relied on a correct position for translationUnit.sourceLocationAtWithoutReparsing(), but the just typed characters were not yet reparsed. And we do not want to reparse at that point since takes too long. We already determine the utf8 position for the dot character, so simply use that instead. This completes commit 17c1325cc45eb563333d28725a51c04e33cd01f2. Change-Id: I669888b5c17ee63b2aec7b16c9921f9d79e281f9 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
| * Clang: Fix dot-arrow-correction for zero resultsNikolai Kosjar2016-06-245-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | If there are no completion items, do not add snippets since these will otherwise pop-up at undesired positions, e.g. when: 1) Typing float/doubles: 0. 2) Typing file suffix in include directives: #include "stdio. Task-number: QTCREATORBUG-16188 Change-Id: Ie1c29826dc62dc447b2ff57b0c5537eb9d9511ef Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* | Qmake: Add a macro expander to get the currently configured mkspec of a kitTobias Hunger2016-06-282-0/+10
| | | | | | | | | | | | Change-Id: I97cd6f47c20867277ed7612a0cf5a179dedd7501 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | CMake: Only start parsing when creator gets focus againTobias Hunger2016-06-288-44/+99
| | | | | | | | | | | | | | | | | | | | Rip out QFileSystemWatcher and use Qt Creators IDocument for file watching instead. The latter properly delays any action till creator gets focus again. Task-number: QTCREATORBUG-16354 Change-Id: Ibb71963416b09712a80ee95347425550453b7fd4 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
View Lorry Controller Status