Thomas Hartmann
|
2cb238471a
|
QmlDesigner: Modernize
modernize-use-using
Change-Id: Ia8eef3d97db7b99ec813a030e1f39ee492d6cf9a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
|
2018-08-01 07:42:47 +00:00 |
|
hjk
|
39a38d5679
|
Wholesale conversion to #pragma once
Kudos to cgmb and https://github.com/cgmb/guardonce
Change-Id: Ifa8970734b8d43fd08c9260c645bdb0228633791
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
|
2016-03-30 15:20:19 +00:00 |
|
Tobias Hunger
|
38cce7eb83
|
Update License according to agreement with Free Qt Foundation
* Update all files in share folder
Change-Id: I8a82c3eb2eb614d4339dd4c4e690f54b5f29d813
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
|
2016-01-19 16:05:29 +00:00 |
|
Alessandro Portale
|
374f84acc7
|
Qt Quick Designer: License change to Qt Commercial + GPLv3
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>
|
2015-09-18 12:12:57 +00:00 |
|
Tobias Hunger
|
ae477c3a4b
|
qml2puppet: s/Q_DECL_OVERRIDE/override/g
Change-Id: I4c582486572df9d94c53163321212b15dcc042cf
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
|
2015-06-08 10:51:24 +00:00 |
|
Eike Ziller
|
3c85058694
|
Update License
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
|
2015-01-16 12:37:56 +01:00 |
|
Eike Ziller
|
8295b503be
|
License update
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
|
2014-10-09 11:41:44 +02:00 |
|
Robert Loehning
|
746c5d8863
|
Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
2014-01-08 08:29:47 +01:00 |
|
Marco Bubke
|
2b698e31ed
|
QmlDesigner: Add override to qml2puppet
Change-Id: Ibdf07c4a35b40f3fc78300a1675270f8295bec42
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
|
2013-04-16 16:52:20 +02:00 |
|
Marco Bubke
|
5d3c1a2a2b
|
QmlDesigner: Remove old functions in instances
Change-Id: If886ca208de775472c4e97e986c2f4df81615959
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
|
2013-04-16 16:52:00 +02:00 |
|
Marco Bubke
|
0de9237699
|
QmlDesigner: Add PropertyName usage in instances
Change-Id: Ia7eb8730c61347833c70a3d62787c10e2a3134ca
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
|
2013-04-16 16:51:54 +02:00 |
|
Oswald Buddenhagen
|
1fda2111d4
|
Merge remote-tracking branch 'origin/2.6'
Conflicts:
src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
src/plugins/debugger/qtmessageloghandler.cpp
src/plugins/debugger/qtmessagelogwindow.cpp
src/plugins/madde/maemodeployconfigurationwidget.cpp
src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
src/plugins/qmldesigner/designercore/include/widgetqueryview.h
src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
src/plugins/qnx/bardescriptormagicmatcher.h
src/plugins/qt4projectmanager/profilekeywords.cpp
src/plugins/remotelinux/deployablefilesperprofile.cpp
src/plugins/remotelinux/deployablefilesperprofile.h
src/plugins/remotelinux/deploymentinfo.cpp
src/plugins/remotelinux/deploymentsettingsassistant.cpp
src/plugins/remotelinux/profilesupdatedialog.cpp
tests/auto/icheckbuild/ichecklib.cpp
tests/auto/icheckbuild/parsemanager.cpp
tests/auto/icheckbuild/parsemanager.h
Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
|
2013-01-31 16:25:33 +01:00 |
|
Eike Ziller
|
6fd252b0a5
|
Merge remote-tracking branch 'origin/2.6'
Conflicts:
share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
src/plugins/debugger/qtmessageloghandler.cpp
src/plugins/debugger/qtmessageloghandler.h
src/plugins/debugger/qtmessagelogwindow.cpp
src/plugins/madde/maemodeployconfigurationwidget.cpp
src/plugins/madde/maemodeployconfigurationwidget.h
src/plugins/remotelinux/deployablefilesperprofile.cpp
src/plugins/remotelinux/deployablefilesperprofile.h
src/plugins/remotelinux/deploymentinfo.cpp
src/plugins/remotelinux/deploymentinfo.h
src/plugins/remotelinux/deploymentsettingsassistant.cpp
src/plugins/remotelinux/profilesupdatedialog.cpp
src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
tests/auto/icheckbuild/ichecklib.cpp
tests/auto/icheckbuild/ichecklib_global.h
tests/auto/icheckbuild/parsemanager.cpp
tests/auto/icheckbuild/parsemanager.h
tests/manual/ssh/tunnel/tunnel.h
Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
|
2012-10-05 21:20:50 +02:00 |
|
Marco Bubke
|
770ab68c45
|
QmlDesigner.Instances: Refactor the qml2 puppet
Change-Id: Iaa7a744ecf13e011addc573a381ea523d2d50a55
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
|
2012-09-24 11:46:20 +02:00 |
|