summaryrefslogtreecommitdiff
path: root/src/plugins/qmldesigner
Commit message (Collapse)AuthorAgeFilesLines
* QmlDesigner: fix runtime warningThomas Hartmann2012-10-041-2/+3
| | | | | | | m_controlShape is not in any scene. Change-Id: I5047bf43cf33be409c7644ff03beee3e04ffbd60 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* QmlDesigner: crash fixThomas Hartmann2012-10-041-1/+1
| | | | | | | | | | | 1000ms is too long. It was possible to close the designer before the 1000ms finished. 100ms make it impossible to close the designer fast enough to trigger the crash. Change-Id: Ie12b406298350551551b36cb021b560eeeba7ecf Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* QmlDesigner: fix for QTimeThomas Hartmann2012-10-011-1/+8
| | | | | | | | | We have to call start() for QTime. Calling elapsed() without calling start before was never defined. Change-Id: I229b3cbb30a2b3e5e98fdb05736ee0f37ae42c38 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* Fix qbs buildOrgad Shaneh2012-09-271-3/+1
| | | | | Change-Id: I7b0c983a2a99228595a6daa1da95ca863ba66bcc Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* QmlDesigner: use import QtQuick 1.0 and not Qt 4.7Thomas Hartmann2012-09-279-9/+9
| | | | | | | Qt5 warns about import Qt 4.7 Change-Id: I1561f957637945d4bc61fb90abd8d0a60599133f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* QmlDesigner: QPixmap::grabWidget() is depricated in Qt 5Thomas Hartmann2012-09-271-1/+6
| | | | | Change-Id: Ie74c61704573f517586c5acb7a87826942ee7dd3 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* QmlDesigner: removing declarative dependency from pluginsThomas Hartmann2012-09-279-20/+0
| | | | | | | | | The depedency on declarative is unnecessary. Change-Id: I2b48bbb109c593ee4a7a2b5f225c57fad3e93bd8 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> (cherry picked from commit f488c59f894e2be9f397c053260cb55a754f984f) Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* QmlDesigner: removing dependency on <private/qdeclarativemetatype_p.h>Thomas Hartmann2012-09-271-11/+17
| | | | | | | | | Removing dependency on <private/qdeclarativemetatype_p.h> in property editor. Change-Id: I9c4fa74994bd72570113145c0bb4d9d239a40f08 Reviewed-by: Marco Bubke <marco.bubke@digia.com> (cherry picked from commit b8caadc3348b651e221d121376f25677b1f102e0)
* 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: fix compile for Qt 5Thomas Hartmann2012-09-271-0/+4
| | | | | | | | | | | The itemlibrary ideally should not rely on private headers. Fixing this requires heavy refactoring so we rely on private headers for now. Change-Id: If52c1254ac164995dbb667b5baa024635f6d3dc8 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> (cherry picked from commit b356ad9621ade487f37a47b9630a05c2838f7168) Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* QmlDesigner: compile fix for Qt5Thomas Hartmann2012-09-272-4/+0
| | | | | | Change-Id: I754c28279df7509bf0723789d616b8913148f4d6 Reviewed-by: Marco Bubke <marco.bubke@digia.com> (cherry picked from commit b4612f19021245db6b0c389d1b6c063f27d10724)
* QmlDesigner: fixing itemlibrary plugins for Qt 5Thomas Hartmann2012-09-2717-3/+139
| | | | | | | | Adding the .json file and using the correct macro. Change-Id: I37bede5b4c4a5af002b39b614aeb6c166bd5ddda Reviewed-by: Marco Bubke <marco.bubke@digia.com> (cherry picked from commit a42eeecffa4e4b27772d91f98045ab45c5e0c3ed)
* QmlDesigner: final compile fixes for 2.6 on Qt 5Thomas Hartmann2012-09-271-1/+0
| | | | | Change-Id: Iba13f1b03a641f913d69822ddd623d6bfe38825f Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* 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: fixing compile for Qt 5Thomas Hartmann2012-09-271-2/+2
| | | | | | | | | grabMouseWhileInWindow(); is not an option in Qt 5 anymore. Change-Id: Ie198a0e3d83fffb62ff51ec2475134cdf4f9dcee Reviewed-by: Marco Bubke <marco.bubke@digia.com> (cherry picked from commit cda0c6c3c4c019f2e051493a3dc30277fe34d0aa)
* QmlDesigner: fix compile for Qt 5Thomas Hartmann2012-09-271-1/+6
| | | | | | Change-Id: I34282a36db8af9c5550ee4c9080519ce0c096d8e Reviewed-by: Marco Bubke <marco.bubke@digia.com> (cherry picked from commit 08af5097597f227fe69339b49c302edc0f5c42dd)
* 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: compile fix for Qt5Thomas Hartmann2012-09-271-0/+1
| | | | | | Change-Id: Iff39fdf8a58c7e844b087dbab7c112630d6c50ad Reviewed-by: Marco Bubke <marco.bubke@digia.com> (cherry picked from commit 012fad1dfb0667a4cb8a464a3f893c9bf89691ed)
* Introduce $$QTC_PREFIXDaniel Molkentin2012-09-251-1/+1
| | | | | | | | | | | | | | | | 'make install' now installs to $(INSTALL_ROOT)$$QTC_PREFIX/... This is used for giving the contents of the 7zips an additional prefix. (previously done by doing an additional copying step in bindistHelper). QTC_PREFIX can also be used to give Qt Creator a different install path at qmake time, and defaults to /usr/local on Linux. On Windows and Mac there is no default for QTC_PREFIX. Usage: qmake -r QTC_PREFIX=/qtcreator-2.6.0 && make && INSTALL_ROOT=/tmp/creator-dist make install Change-Id: Id30781e14bfdde52531800f22b22e39f0459e806 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Revert "Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT)."Eike Ziller2012-09-071-1/+1
| | | | | | | | | | It depends on and mixes in changes made in another change on gerrit that is not merged, so it breaks the package build. This reverts commit c29bf6f6525d435d69936576761b4a29102cd056. Change-Id: Ibb251150909271f3e119f05a1691832aae8ac633 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT).Daniel Molkentin2012-09-051-1/+1
| | | | | | | | | | | | | | | | | Reason: $INSTALL_ROOT is only meant to be used by packagers to temporarily put the contents into a different location, which is needed for fakeroot packaging. QTC_PREFIX is not a qmake variable, and defaults to /usr/local. On Windows the default prefix is "QtCreator", since "make install" is expected to be used in a packaging context only where either INSTALL_ROOT should be used or QTC_PREFIX should be set to the absolute destination path where e.g. an installer generator will pick it up. Change-Id: Ifa4950340e58e34726c53f5417adcc7b50828ce1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* s/profile/kit/Tobias Hunger2012-09-041-3/+3
| | | | | | | | | | | | | | | * Rename profiles to kits. * Update some strings: * projects mode has a Kits tab, not a Targets tab. * " Settings" was dropped from the sub-tabs of the Kits tab * menu entry "Build/Open Build/Run Target Selector" was renamed to "Build/Open Build and Run Kits Selector". * Use "Kit" instead of "Target" in miniprojecttargetselector. (The class was not renamed as it does indeed select targets, not kits) Change-Id: I0727e086e2dfa0e8aaaf89fdc6f2e3596c7a4314 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* 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>
* Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-08-2364-818/+6
|\
| * Removal of Symbian supportAlessandro Portale2012-08-2264-818/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | QmlDesigner: Fix qbs build.Christian Kandeler2012-08-221-16/+0
| | | | | | | | | | | | | | Was broken by I03935715e51777efffea533310a9d775cb676dca. Change-Id: I8395809db4d18da3ecafccbcb1221e0c8dfca70c Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* | QmlDesigner.FormEditor: Remove Anchor modeMarco Bubke2012-08-2226-2596/+13
| | | | | | | | | | Change-Id: I03935715e51777efffea533310a9d775cb676dca Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* | QmlDesigner.FormEditor: Refactoring graphics viewMarco Bubke2012-08-225-257/+0
|/ | | | | Change-Id: I75d7d3fb230a348c62ecb32236c698e10c8b842c Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Remove NULL tests for Core::ICore::settings()Orgad Shaneh2012-08-091-2/+1
| | | | | | | It cannot really be NULL Change-Id: I7231e00754464347dc5750249f751cda7f831930 Reviewed-by: hjk <qthjk@ovi.com>
* rename QtDebug to QDebughjk2012-08-0639-39/+39
| | | | | | | More uniform. Change-Id: I1c6057981f4c2b3170a4e69f0674fe4caf1143a2 Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
* use new id comparison operators to reduce line noise and save cycleshjk2012-08-061-4/+3
| | | | | Change-Id: I2e7d81a4efb75877901d29964df4f71314e951b4 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Changed URL to qt-project.org in pluginspecs.Konstantin Tokarev2012-07-301-2/+2
| | | | | | | Also, it's 2012 now. Change-Id: I69a8d1d77658b2bb2cb547362d5e3163385cab3b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* madde/qnx/remotelinux: adjust after profile changeshjk2012-07-261-11/+8
| | | | | | | | | | | More Profile use, less dependency on QtSupport, Derive qtVersionId from profile instead of qt build configuration. Replace qt4BuildConfiguration with buildConfiguration. Use IDevice base class in AbstractRemoteLinuxApplicationRunner and in other places. Simplify remote linux runconfiguration Change-Id: I6414d3d8146d16c360b3a0465c57a052ea71f899 Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* Contact -> qt-project.orgEike Ziller2012-07-19414-1244/+416
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* introduce qmakeProperty(), use instead of versionInfo() where applicableOswald Buddenhagen2012-07-091-1/+1
| | | | | | | the idea is to encapsulate accesses to specific variables. Change-Id: Icafd2c85de6178db1a492a5dd36dde7f1925ea21 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Profile introductionTobias Hunger2012-06-211-20/+7
| | | | | | | | | | | | | Introduce Profiles to store sets of values that describe a system/device. These profiles are held by a target, getting rid of much of the information stored in the Build-/Run-/DeployConfigurations, greatly simplifying those. This is a squash of the wip/profile branch which has been on gerrit for a while, rebased to current master. Change-Id: I25956c8dd4d1962b2134bfaa8a8076ae3909460f Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Make PluginManager mostly static.Eike Ziller2012-06-191-1/+2
| | | | | Change-Id: Ib938aa4999c7c418a82304c5cca2e8748ef9d228 Reviewed-by: hjk <qthjk@ovi.com>
* Fix qbs code styleYuchen Deng2012-06-191-3/+3
| | | | | Change-Id: Ia3e4df528d391580064efbeeab75016335a4299d Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove unused files from QmlDesignerJoerg Bornemann2012-06-112-507/+0
| | | | | Change-Id: I5866d7a0103d70350c1f739d6a8e1d8c9ef31a44 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* ActionManager API cleanup.Eike Ziller2012-05-251-29/+27
| | | | | | | | d-pointer instead of inheritance static methods Change-Id: I7b2f0c8b05ad3951e1ff26a7d4e08e195d2dd258 Reviewed-by: hjk <qthjk@ovi.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>
* IOptionsPage: replace virtual fuctions by data membershjk2012-05-232-32/+8
| | | | | Change-Id: I8297df85109b67b79f90c33263a5dc7b89efbb60 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* explicitly enable exceptions where they are requiredKonstantin Ritt2012-05-211-0/+2
| | | | | | | | | | | commit 2b21dd69d6a4e47f0ec3d3958ab1def0983ce76c in qtbase desabled the exceptions support by default for most modules. Make sure we explicitly enable them for plugins and libraries that uses exceptions internally. Change-Id: Id3dc9d572ac7ccd35a869046cfc5d6c4ffec3ba2 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* editormanager: simplify use of interfacehjk2012-05-114-13/+7
| | | | | | | Less code on the user side, same meaning. Change-Id: I14e54a5d2ed8e024a51cce74eaf7c8419ad544be Reviewed-by: Eike Ziller <eike.ziller@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>
* Merge remote-tracking branch 'origin/2.5'Oswald Buddenhagen2012-04-191-0/+3
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri src/libs/utils/utils.qbs src/plugins/projectexplorer/miniprojecttargetselector.cpp src/plugins/qmljseditor/qmljseditor.qbs src/plugins/qmljsinspector/qmljsinspector.qbs Change-Id: Ib239d50c21cb06d3a8e821e03dc093552f40ffab
| * 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>
* | qbs files: build with Qt5Joerg Bornemann2012-04-101-0/+2
| | | | | | | | | | | | | | Help plugin and QmlDesigner have been disabled for Qt5. Change-Id: I9345d0fd00f9a575333dc972cc7adbdf146cd6cb Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
View Lorry Controller Status