aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner/componentsplugin
Commit message (Collapse)AuthorAgeFilesLines
* Use dialogParent() instead of mainWindow()Eike Ziller2020-06-021-1/+2
| | | | | | | | | | There are very few reasons to use mainWindow() directly. Especially for modal dialogs, using dialogParent() is important, since that guarantees the stacking order in case of other dialogs currently being open. Change-Id: I7ad2c23c5034b43195eb35cfe405932a7ea003e6 Reviewed-by: hjk <hjk@qt.io>
* Integrate Edit3D view into CreatorMiikka Heikkinen2020-02-241-0/+1
| | | | | | | | | Edit3D view is now a tab alongside Form Editor. Buttons were moved to a Creator side task bar on Edit 3D view. Change-Id: Ia06107e4f855ba512ffea3e628a61558894e800e Fixes: QDS-1570 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Remove apparently unneeded QtPlugin includeshjk2020-02-121-2/+0
| | | | | | Change-Id: I511c0318a72dbf2a92e4749dee02eabfc9826139 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlDesigner: remove QtQuick.Controls 1 leftoversTim Jenssen2020-01-1522-320/+12
| | | | | | Change-Id: Iec028fb3e3803dae21d67b40a1d04dec399fba04 Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: fix old GridLayout image in the navigatorTim Jenssen2020-01-101-0/+0
| | | | | | | Give it the updated flat look Change-Id: Ifdfb503eed3c770d0170217a22f0097669494885 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Remove excess blank lines after namespaceOrgad Shaneh2019-05-271-1/+0
| | | | | Change-Id: I4e4f83017f2bfc2cf842c4c971ed4b05e0447e6a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlDesigner: Fix iconsThomas Hartmann2019-04-024-0/+0
| | | | | | Task-number: QDS-538 Change-Id: If827453b95d76b20094ed83ec0673604ed7b188a Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Fix iconsThomas Hartmann2018-11-082-0/+0
| | | | | | Task-number: QDS-286 Change-Id: Iecf8847248385eedc4b8fb90268038fc82faf12c Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlDesigner: Update icons of Qt Quick DesignerThomas Hartmann2018-08-2212-0/+4
| | | | | Change-Id: I970da740c15505cae525fc3514a27c1bc12fe40f Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: ModernizeAlessandro Portale2018-07-256-14/+14
| | | | | | | | | | | | modernize-use-auto modernize-use-nullptr modernize-use-override modernize-use-using modernize-use-default-member-init modernize-use-equals-default Change-Id: Ic42b5c59fed5a4a01853138542d8156471e86f58 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Remove outdated Qt version conditionsOrgad Shaneh2018-05-111-2/+0
| | | | | Change-Id: I7fa3147afbdc07814f8710a44140072e7bbd8511 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Use Qt5-style connectOrgad Shaneh2017-03-203-3/+3
| | | | | | | + De-slot where possible Change-Id: Ibd2edbef7b7712aba20593bd0417940e828e0c9c Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Implementing actions for stacked containerThomas Hartmann2017-02-151-0/+1
| | | | | | | | | | | | | | | | | | | * Adding action for adding item * Adding action for decreasing index * Adding action for increasing index User visible strings for the actions are defined in: componentcore_constants.h The name of the index property is given by a hint in the .metainfo file. If there is no hint we try "index" and "currentIndex". This is tested with StackedLayout but should work with similar containers like SwipeView. Change-Id: Ief1b4206db1950130bcb0edcbd61885b3ec9d8b0 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Adding hints for StackLayoutThomas Hartmann2017-02-091-0/+4
| | | | | Change-Id: I3885662bf50a10321cc756a9acd8dada4bfa7b73 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Adding a toolbarThomas Hartmann2017-01-051-1/+1
| | | | | | | | | | | | | | * Icons are not the final ones. * I fixed a couple of glitches and cleaned up the code. - Action for copy and paste/delete were not properly updated - Delete had no icon - Using std::function for action predicates and operations - The context menu has no icons. This way we avoid having to define 2 icons. Change-Id: Ic23cbc78ba299c19e07e8de775eb813aae55db9b Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Remove scrollbarThomas Hartmann2016-11-211-22/+0
| | | | | | | | | The images do not exist and scroll bar is not required in the item library. Task-number: QTCREATORBUG-17307 Change-Id: Id8f493fdcee97a611d38a8ba896af1d53ed340da Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* qbs build: Fix more warnings on WindowsChristian Kandeler2016-08-301-1/+4
| | | | | Change-Id: I2104d2889cff0fd6a2473e1e141936bb781041a9 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* QmlDesigner: Use proper icons for Controls 1.0Thomas Hartmann2016-07-2838-39/+1
| | | | | | | | * Using proper icons * Removing unused images Change-Id: I0b4ba6d33f14950fef28f9546aa39b7f5d5a38dd Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Fix qbs build on macOSChristian Kandeler2016-07-281-1/+1
| | | | | | | "osx" -> "macos" Change-Id: Ie25e096b2759cf8f96411560fcca337169d80b08 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* QmlDesigner.ItemLibrary: Adding support for StackLayoutThomas Hartmann2016-07-274-0/+18
| | | | | | | | The StackLayout is working and it makes sense to add it to the item library. Change-Id: I732398a25091f2a33f38c42f5bf1c55ef9dac237 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlDesigner.PropertyEditor: Cleanup importsThomas Hartmann2016-07-121-3/+1
| | | | | Change-Id: I728ba1f8d9095bc31e11f507f11cdadc04e16285 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* qbs build: Remove version part from more plugin file namesChristian Kandeler2016-07-081-0/+1
| | | | | | | | | The QmlDesigner plugins do not conform to the plugin conventions, so they do not derive from QtcPlugin and were thus overlooked in 35c17ac73a. Change-Id: Idb67701be448c8d57759c94504cbbcb2dafa9775 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* qbs build: Introduce new module "qtc".Christian Kandeler2016-06-081-1/+1
| | | | | | | | | The qtc module gathers properties that used to live in the top-level project file. This is the first step towards making it possible to build plugins against an installed Qt Creator ("out of source build"). Change-Id: Ia1514cc9c888e80be01b308e908de48980fcbdb8 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* QmlDesigner: Remove unused source filesOrgad Shaneh2016-05-181-1/+0
| | | | | | | Logger component and an unused header. Change-Id: I3e92a4ea3c13eee4bef2a1e452a51509eeab2b17 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* qbs build: Un-break and re-add QmlDesigner product.Christian Kandeler2016-05-171-0/+65
| | | | | Change-Id: I2d4c069ef2d566ed466f0ba6a4f24a90ea6ffba9 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* Merge remote-tracking branch 'origin/4.0'Eike Ziller2016-04-221-0/+13
|\ | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs Change-Id: I0cbc9d335073e3234f472aa43f462eef9a9178aa
| * QmlDesigner: Add TreeView to item libraryThomas Hartmann2016-04-211-0/+13
| | | | | | | | | | Change-Id: I8108202f1f8226502016d054dee64a5a5e2c5ebb Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/4.0'Eike Ziller2016-04-123-8/+8
|\| | | | | | | | | | | | | Conflicts: src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp Change-Id: I6ae2d37290643d69390f679a54f7596782f3d97f
| * QmlDesigner: use default values at isSubclassOfTim Jenssen2016-04-063-8/+8
| | | | | | | | | | Change-Id: Ia31d698635a9b29a023f4d919f3741ac912923b7 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* | Wholesale conversion to #pragma oncehjk2016-03-305-21/+5
|/ | | | | | | Kudos to cgmb and https://github.com/cgmb/guardonce Change-Id: Ifa8970734b8d43fd08c9260c645bdb0228633791 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* PNGs: Remove sRGB chunkTobias Hunger2016-02-294-0/+0
| | | | | | | | | libPNG does nag about broken/useless sRGB headers on the console for a while now. Remove them from our PNGs to stop that text from appearing in the console on startup. Change-Id: I2f49f892397bf9d4498ac39210fd6d1d4f29269e Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-1923-230/+231
| | | | | | | * Update files in src/plugins Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* QmlDesigner: Window types have no gradient propertyTim Jenssen2015-12-091-1/+1
| | | | | | | Change-Id: I27beda2c83eceffe7b7e748cb5bbcfd32fcc823d Task-number: QTCREATORBUG-15423 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
* QmlDesigner: Enabling actions for componentsThomas Hartmann2015-09-281-0/+3
| | | | | Change-Id: I817aa9640d7eabfa0bc0f73bbd8e666f1c046a99 Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* QmlDesigner: QT_NO_CAST_FROM_ASCIIAlessandro Portale2015-09-251-2/+2
| | | | | | | No need to be special in this regard. Change-Id: If84ca4c84c1972171ffdc9ee25e426c454c39e6e Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Qt Quick Designer: License change to Qt Commercial + GPLv3Alessandro Portale2015-09-1823-276/+161
| | | | | | | | Change-Id: I7f7aecd02892b6c616cd148fa5d845e7bc0d3b4f Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* QmlDesigner: Fix warnings about inconsistent override usageTobias Hunger2015-08-271-2/+2
| | | | | Change-Id: I71de3d105c97940fe3b72adfbe3dbb898d7a7d2e Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* QmlDesigner: Updating icons for item libraryThomas Hartmann2015-07-1718-8/+59
| | | | | Change-Id: I9aff69864fc91e494bed0e710d78bbdacb8ddddd Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* QmlDesigner: Using Q_DECLARE_TR_FUNCTIONSThomas Hartmann2015-07-172-1/+5
| | | | | Change-Id: I9af569864fc91e494bed0e810d711bdacb8dddff Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* QmlDesigner.PropertyEditor: Add sheet for ApplicationWindowThomas Hartmann2015-07-172-0/+149
| | | | | Change-Id: Id3d05201a20fce24f20c65e101818ac2231f38ee Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* PNG: Run pngcrush on images with iCCP or sRGB profilesTobias Hunger2015-07-034-0/+0
| | | | | | | | This quietens warnings from libPNG during startup and shrinks the image sizes. Change-Id: Ieb4cb5e8ba30b99653896e283c2fb2cc267257f2 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* qmldesigner: s/Q_DECL_OVERRIDE/override/gTobias Hunger2015-06-082-5/+5
| | | | | Change-Id: I8853e3e8c6fe6e6a54d73ce0014f1ae37d377378 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* QmlDesigner: Remove unused filesTobias Hunger2015-05-044-0/+0
| | | | | | Change-Id: I5038963f13ab82a58fddbf0dd95fa173d5f07424 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'Eike Ziller2015-02-1223-133/+133
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/tooltip/tipcontents.cpp src/libs/utils/tooltip/tipcontents.h src/plugins/android/androiddeployqtstep.cpp src/plugins/baremetal/baremetalconstants.h src/plugins/baremetal/baremetaldevice.cpp src/plugins/baremetal/baremetaldevice.h src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp src/plugins/baremetal/baremetaldeviceconfigurationwidget.h src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h src/plugins/baremetal/baremetalplugin.cpp src/plugins/baremetal/baremetalplugin.h src/plugins/baremetal/baremetalruncontrolfactory.cpp src/plugins/baremetal/baremetalruncontrolfactory.h src/plugins/cppeditor/cppcodemodelinspectordialog.cpp src/plugins/cppeditor/cppdoxygen_test.cpp src/plugins/cppeditor/cppdoxygen_test.h src/plugins/debugger/breakpointmarker.cpp src/plugins/debugger/debuggeritemmodel.cpp src/plugins/debugger/debuggeritemmodel.h src/plugins/debugger/loadcoredialog.cpp src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp src/plugins/projectexplorer/addnewmodel.cpp src/plugins/projectexplorer/addnewmodel.h src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp src/plugins/qmlprofiler/abstracttimelinemodel.cpp src/plugins/qmlprofiler/abstracttimelinemodel.h src/plugins/qmlprofiler/notesmodel.cpp src/plugins/qmlprofiler/qml/CategoryLabel.qml src/plugins/qmlprofiler/qml/MainView.qml src/plugins/qmlprofiler/qml/Overview.js src/plugins/qmlprofiler/qml/Overview.qml src/plugins/qmlprofiler/qml/TimeDisplay.qml src/plugins/qmlprofiler/qml/TimeMarks.qml src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp src/plugins/qmlprofiler/sortedtimelinemodel.cpp src/plugins/qmlprofiler/sortedtimelinemodel.h src/plugins/qmlprofiler/timelinemodelaggregator.cpp src/plugins/qmlprofiler/timelinemodelaggregator.h src/plugins/qmlprofiler/timelinerenderer.cpp src/plugins/qmlprofiler/timelinerenderer.h src/plugins/qmlprojectmanager/QmlProjectManager.json.in src/plugins/texteditor/findinfiles.cpp src/plugins/vcsbase/vcsconfigurationpage.cpp src/shared/qbs src/shared/scriptwrapper/interface_wrap_helpers.h src/shared/scriptwrapper/wrap_helpers.h tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp tests/system/suite_debugger/tst_debug_empty_main/test.py tests/system/suite_debugger/tst_qml_js_console/test.py tests/system/suite_debugger/tst_qml_locals/test.py Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
| * Update LicenseEike Ziller2015-01-1623-133/+133
| | | | | | | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | Fix stringsJarek Kobus2014-12-051-1/+1
| | | | | | | | | | Change-Id: I12e52c7e584d26205b98672a65257af5c55dda24 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | QmlDesigner: Use Core::AsynchronousMessageBoxMarco Bubke2014-11-251-2/+2
| | | | | | | | | | | | | | | | Warning which needs return value should be asynchronous because the event loop of the blocking dialog leads to crashes. Change-Id: Ie49c95d63ec3f2183378013c726c3b99680dc7b0 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* | QmlDesigner: Use Utils::AsynchronousMessageBox::warningMarco Bubke2014-11-241-1/+3
|/ | | | | | | | Warning which needs return value should be asynchronous because the event loop of the blocking dialog leads to crashes. Change-Id: I2e348f9351611dfd053cd3fbacfb6696401ee427 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner: Followup on name changeThomas Hartmann2014-11-049-40/+40
| | | | | Change-Id: I805a15c4a6bd95442c48956f8d37e2d00457ca36 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Use QFileInfo::exist(f) instead of QFileInfo(f).exists() if possiblehjk2014-11-031-1/+1
| | | | | | | | Faster. Change-Id: I91aa67462e11ff3258600d7f158de79942d0dc81 Reviewed-by: Marc Reilly <marc.reilly@gmail.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com>