summaryrefslogtreecommitdiff
path: root/src/plugins/qmldesigner/designercore
Commit message (Collapse)AuthorAgeFilesLines
* QmlDesigner: removing dependency on private/qdeclarativestringconverters_p.hThomas Hartmann2012-09-275-14/+179
| | | | | | | | PropertyParser takes care of the issue now. Change-Id: Ib75c47f239fef05cdc3a9032d011d69483c381d5 Reviewed-by: Marco Bubke <marco.bubke@digia.com> (cherry picked from commit 40714ca7a02a63b4cf3e9cfb01ebec1d4449d4f3)
* QmlDesigner: compile fix for Qt5Thomas Hartmann2012-09-271-2/+0
| | | | | | Change-Id: I754c28279df7509bf0723789d616b8913148f4d6 Reviewed-by: Marco Bubke <marco.bubke@digia.com> (cherry picked from commit b4612f19021245db6b0c389d1b6c063f27d10724)
* QmlDesigner: using 4.8 datastream also in Qt 5Thomas Hartmann2012-09-271-0/+4
| | | | | | Change-Id: If208a0e3d8342fb62fff1ec2475134cdf4f9dcee Reviewed-by: Marco Bubke <marco.bubke@digia.com> (cherry picked from commit 36f9c318abe783d6ff00199e9ee280e7b8faf702)
* QmlDesigner: unused private headerThomas Hartmann2012-09-271-1/+0
| | | | | | Change-Id: Ife75552afb9d96ac760b0d37f0dbd772a35c498c Reviewed-by: Marco Bubke <marco.bubke@digia.com> (cherry picked from commit 419aabcd2c05ed67067b4d3b905145f505e887dc)
* QmlDesigner: removing VariantParserThomas Hartmann2012-09-275-227/+0
| | | | | | | | This class is not used anymore. Change-Id: I132166e3c290eea204f2c286df20c04343c14d55 Reviewed-by: Marco Bubke <marco.bubke@digia.com> (cherry picked from commit 35b0e0ea2f4e7659a3e2163142695ac4a5271c0d)
* QmlDesigner: Remove private class for SubComponentManagerMarco Bubke2012-08-232-91/+53
| | | | | Change-Id: Id56143ee936cf07d38df59e4badec00a3a570c26 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* QmlDesigner: Change QMLFILEPATTERN to s_qmlFilePatternMarco Bubke2012-08-231-2/+2
| | | | | Change-Id: I5fb2faca0b7322908ae7abb7633627b113035dbc Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Removal of Symbian supportAlessandro Portale2012-08-221-1/+1
| | | | | | | | | | | | | | | | | Qt Creator's support for Symbian was at its peak in version 2.4.x. Nobody really verified it in Qt Creator 2.5 or 2.6. It is most likely rotten. Let's remove it! Also, the Symbian support code was spread throughout the whole Qt Creator code base. The plugin interfaces evolved in the meantime and target platforms like Android or QNX have 99% of their code in separate plugins. In case anyone wants to revive Symbian support in Qt Creator, please create a plugin for it. Change-Id: I56a758a3e2fd5b8c64d9aeb8f63d8e916c4883be Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* rename QtDebug to QDebughjk2012-08-0612-12/+12
| | | | | | | More uniform. Change-Id: I1c6057981f4c2b3170a4e69f0674fe4caf1143a2 Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
* Contact -> qt-project.orgEike Ziller2012-07-19199-597/+199
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Silence warning about unnecessary use of the containing namespaceThiago Macieira2012-05-233-5/+5
| | | | | | | | | | | | | ICC complained: src/plugins/qmldesigner/designercore/include/propertycontainer.h(52): warning #1098: the qualifier on this friend declaration is ignored friend CORESHARED_EXPORT QDataStream &QmlDesigner::operator<<(QDataStream &stream, const PropertyContainer &propertyContainer); ^ The solution is to simply remove the namespace qualifier when the class is already inside that namespace. Change-Id: I2256ebe072b3f8db5288f72acb1388eabcb8325c Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* Don't add singleton model manager to object pool.Eike Ziller2012-05-042-20/+4
| | | | | Change-Id: Iffca99867b25500fc77bbcf1e17a50a7cc4cf832 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlDesigner: crash fixThomas Hartmann2012-04-171-0/+3
| | | | | | | | | | There can be holes in the prototype chain. This can lead to a type being its own prototype. Task-number: QTCREATORBUG-7300 Change-Id: I10c76decdf3d6490d468ad9dd1ea65f0cbacdfbb Reviewed-by: Marco Bubke <marco.bubke@nokia.com> Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Replaced one-char-stringsRobert Loehning2012-03-072-7/+7
| | | | | | Change-Id: I0bf982b508a237e5b1e6ba3279cb589bae1b1c1d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Normalized connect()sRobert Loehning2012-03-062-3/+3
| | | | | | Change-Id: Id353ab140a46e06ffc3abf667ab3b234e749e17c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-1542-105/+105
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* QmlDesigner: cleanupThomas Hartmann2012-02-142-77/+2
| | | | | | | Removing some comments... Change-Id: I48dddaf72caea84df883dc9f2f42f2c7eff1c0ce Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
* QmlDesigner: crash fixThomas Hartmann2012-02-101-0/+5
| | | | | | | | This avoids an infinite recursion. For some reason "" might be a proper prototype in some cases. Change-Id: Ib3af9d0ff2fbf87b2ba20a79e8b456831e7a940f Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* Long live the king!hjk2012-01-26195-195/+195
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-11-254-6/+6
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri src/libs/qmljs/qmljstypedescriptionreader.cpp src/plugins/analyzerbase/startremotedialog.ui src/plugins/qmldesigner/designercore/include/rewriterview.h src/plugins/qt4projectmanager/makestep.cpp Change-Id: If9d15a8c8f73106585fd8ce6ac47c253a40af6b1
| * QmlDesigner: crash fixThomas Hartmann2011-11-184-6/+6
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-6558 Change-Id: I5e5719c7764df350f4e466b8f1e90bdeed872b3d Reviewed-by: Eike Ziller <eike.ziller@nokia.com> Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* | Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-11-11199-398/+398
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/qmljs/qmljsinterpreter.cpp src/libs/qmljs/qmljsinterpreter.h src/plugins/debugger/qml/scriptconsole.cpp src/plugins/git/gitplugin.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
| * all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-03199-398/+398
| | | | | | | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | QmlJS: Make Document::Ptr point to a const Document.Christian Kamm2011-11-0810-11/+11
| | | | | | | | | | Change-Id: I15a36c3f918c0ee16f30bc8366df505e0afac949 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
* | Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-10-281-1/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri src/libs/qmljs/qmljscheck.cpp src/plugins/debugger/gdb/gdbengine.cpp src/plugins/debugger/gdb/remotegdbserveradapter.cpp src/plugins/plugins.pro src/plugins/projectexplorer/buildmanager.cpp src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp Change-Id: Id2dcebf95b94dc46c1d85908ba1d1378aaf362ac
| * QmlDesigner.metaSystem: fix fot Qt ComponentsThomas Hartmann2011-10-211-1/+9
| | | | | | | | | | | | | | | | | | In the case of "." imports we loose the package name. This patches "maps back" to QtQuick by default or maps to <cpp> if the package name is empty. Change-Id: Ibe8d782541d109049f3480c7dfd15de69d75da38 Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
* | Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-10-171-5/+86
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: qtcreator.pri src/libs/qmljs/qmljstypedescriptionreader.cpp tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp Change-Id: Id032187023bb42f259a87545ceeb3c965dd01a32
| * QmlDesigner.contextMenu: fix for layoutThomas Hartmann2011-10-131-4/+85
| | | | | | | | | | | | | | Now the items are properly sorted in the layout. Change-Id: Ib1d65ef5a67e618f3e42841c92a5f1fce310d67c Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| * QmlDesigner: fix typoThomas Hartmann2011-10-121-1/+1
| | | | | | | | | | Change-Id: If02d4ae2c5c3dddd877fef80af6eebcd10914b5a Reviewed-by: hjk <qthjk@ovi.com>
* | QmlJS: Add more value_casts.Christian Kamm2011-10-122-20/+20
| | | | | | | | | | | | | | | | | | | | And switch all existing dynamic_casts to value_casts. Change-Id: I93b89358e4802080f40b332074c64f4e91a2bc4c Reviewed-on: http://codereview.qt-project.org/6311 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
* | QmlJS: Rename QmlObjectValue -> CppComponentValue.Christian Kamm2011-10-122-38/+38
| | | | | | | | | | | | | | | | | | Reviewed-by: Fawzi Mohamed Reviewed-by: Thomas Hartmann Change-Id: Ib89388d5a5678403e4637eec5829f3520637ee27 Reviewed-on: http://codereview.qt-project.org/6310 Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com> Sanity-Review: Christian Kamm <christian.d.kamm@nokia.com>
* | QmlJS checks: Add severity and unique id to messages.Christian Kamm2011-10-101-4/+7
| | | | | | | | | | | | | | Change-Id: I2cded26524c3f64152107e65d740658e3003ffac Reviewed-on: http://codereview.qt-project.org/5790 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
* | QmlJS: Move commonly used functions to qmlutils.h.Christian Kamm2011-10-108-74/+31
|/ | | | | | | Change-Id: I22376d96fe575bc00a55094c06af80e32a5587e6 Reviewed-on: http://codereview.qt-project.org/6238 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlJS: Separate metaObjectRevision from minor version number.Christian Kamm2011-09-262-4/+6
| | | | | | | | | | | | | | | | | | They need not to be identical. Additionally: * Rename ImportInfo::name to path, because that's what it does. * Add ImportInfo::name, for getting the uri with the names separated by dots. * Allow for exportMetaObjectRevisions in qmltypes files. * Allow for exports with an empty type name, as generated by qmlRegisterRevision. They are used for associating meta object revisions with non-exported types. * Rewrite the Qt 4.7 import to QtQuick 1.0 at an early stage. In preparation for the Qt 5 type information update, where Qt 4.7 is gone. Change-Id: Ia287193623d9530a56b9eb8d2481d50aabd94c3e Reviewed-on: http://codereview.qt-project.org/5309 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
* fix gcc warningThomas Hartmann2011-09-201-2/+2
| | | | | | | | Change-Id: I7bd2b2d8256efb5782c2c87920cd2ab9da60a227 Reviewed-on: http://codereview.qt-project.org/5235 Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* compile fixThomas Hartmann2011-09-201-6/+6
| | | | | | Change-Id: I95ed9831d016bc967e99e934a09e0cb43054fdba Reviewed-on: http://codereview.qt-project.org/5223 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner: adding crumblePathThomas Hartmann2011-09-201-10/+95
| | | | | | Change-Id: Ic0d68b145398a161194d2a469e9a2f15fe0901d5 Reviewed-on: http://codereview.qt-project.org/4996 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.contextMenu: allowing layout and anchoringThomas Hartmann2011-09-202-28/+314
| | | | | | | Change-Id: Ifbaff782826b413c508f96929222886da37325c5 Reviewed-on: http://codereview.qt-project.org/4986 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.instances: support for auxiliaryData @NodeInstanceThomas Hartmann2011-09-201-1/+1
| | | | | | | | | | This allows overwriting values in node instances only. Change-Id: I596323a9ebc112033c9811a8aaf35fed371cb867 Reviewed-on: http://codereview.qt-project.org/4924 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marco Bubke <marco.bubke@nokia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.model: bugfix for Qt Quick 2.0Thomas Hartmann2011-09-192-0/+25
| | | | | | | | | | The item itself can have any version. we have to check for the version of QtQuick.Item. Change-Id: I57a992dd09491b7990318e208d98a9c4e0011e56 Reviewed-on: http://codereview.qt-project.org/4983 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
* QmlDesigner: Add null checks.Christian Kamm2011-09-191-4/+17
| | | | | | Change-Id: I8f12a5391ec20829422d8c6eab3d4d191527e70e Reviewed-on: http://codereview.qt-project.org/5130 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlJS: Rework exported C++ type registry.Christian Kamm2011-09-192-75/+37
| | | | | | | | | | | | | | | | The problem was that if you exported A 1.0, A 1.1 and B 1.0 where A is the prototype of B the code model had not enough information to know that, depending on the import, B 1.0's prototype should be A 1.1 or A 1.0. To solve this problem QmlObjectValues now store the import's version as well as the local component version. In the example above B 1.0 would have import version 1.1 if the 1.1 module was imported and thus be able to choose the right prototype. Change-Id: I7ef33f12ca5a528c62b2a8240f4b5720b0ebd4c3 Reviewed-on: http://codereview.qt-project.org/5129 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* all: less QScopedPointerhjk2011-09-192-1/+3
| | | | | | Change-Id: I536bdb4d4f0c10fa858560f3c160fc0fff8da9b2 Reviewed-on: http://codereview.qt-project.org/5116 Reviewed-by: hjk <qthjk@ovi.com>
* qmldesigner: code stylehjk2011-09-1515-124/+124
| | | | | | | Change-Id: I4088695312de5ea526578c6b901a79a9662797b8 Reviewed-on: http://codereview.qt-project.org/4961 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* Merge remote-tracking branch 'origin/2.3'Eike Ziller2011-09-151-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.pro share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp src/plugins/qt4projectmanager/qt4buildconfiguration.cpp src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp src/plugins/remotelinux/remotelinuxruncontrol.cpp Change-Id: I9c89ba9fa2928e14e148041f9001856dce47a20b
| * QmlDesigner.contextMenu: crash fixThomas Hartmann2011-09-121-2/+2
| | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-6071 Change-Id: Iae2cc199cd8ec3809bc635084b8a8fa79bb36b08 Reviewed-on: http://codereview.qt-project.org/4643 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Coding style: Pure virtual functions, private implementation pointers.Christian Kandeler2011-09-151-1/+1
| | | | | | | | | | | | Change-Id: I293f8dbd4e467e866bab381841659a07e32b9d90 Reviewed-on: http://codereview.qt-project.org/4948 Reviewed-by: hjk <qthjk@ovi.com>
* | QmlJS: Adjust existing code for updated QML parser.Christian Kamm2011-09-146-29/+27
| | | | | | | | | | | | Change-Id: I153723eeb9973be025daf47e317f7b9d076a3c72 Reviewed-on: http://codereview.qt-project.org/4733 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* | QmlJS: Use mime types to distinguish qml and js files.Christian Kamm2011-09-126-6/+6
| | | | | | | | | | | | | | | | | | This allows adding patterns to the qml mime type in the options dialog. Previously they were always parsed as js. Change-Id: Ifa344fb6ab8cbcda02becef991cf6807615a1caa Reviewed-on: http://codereview.qt-project.org/4515 Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
* | QmlDesigner.NodeInstances: Show stripes for items without contentMarco Bubke2011-09-065-7/+21
| | | | | | | | | | | | | | Change-Id: I6c737616d485445d77efd8b6d73b2d8259e5120b Reviewed-on: http://codereview.qt.nokia.com/4288 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
View Lorry Controller Status