summaryrefslogtreecommitdiff
path: root/src/designer/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* remove pointless INCLUDEPATHsOswald Buddenhagen2013-05-031-3/+0
| | | | | Change-Id: I8e8bfd391ef8b243e288094f5a02544efe1b2f49 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* parallelize SUBDIRSOswald Buddenhagen2013-05-031-1/+0
| | | | | | Change-Id: Ie1c6e8e479c8f2e758b03175d9250a71e52ce3ce Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-141-1/+1
|\ | | | | | | Change-Id: Ic32eb7c209f299f8a677fd7f247d4800eaafa879
| * Enable Active-X plugin in Qt Designer.Friedemann Kleint2013-03-061-1/+1
| | | | | | | | | | | | | | Task-number: QTBUG-29733 Change-Id: I290c476d1ba84ca6ff519aa9d437d28e4ea066d8 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Active X plugin: Fix setting a control by task menu.Friedemann Kleint2013-03-011-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | The property is a QString when set by the menu or a PropertySheetStringValue when loading the form. Breakage introduced by 8695c1753964eeb06b5d9306010b56be5fc151c0 . Task-number: QTBUG-29234 Change-Id: I84c3de80b99c8a20aaf1f8f7289882b0092d6a0a Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-182-3/+2
|\ \ | |/ | | | | Change-Id: Icc911c4f334091c0e1ece149ac68fab25ca07bd0
| * Fix CONFIG of tool-plugins.Friedemann Kleint2013-02-111-1/+1
| | | | | | | | | | Change-Id: I09c9abb08ba9f1ba171bf468e6cbc9010aaf0b53 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Merge branch 'release' into stableSergio Ahumada2013-01-311-2/+1
| |\ | | | | | | | | | Change-Id: Ib896ae10a70d72eb671edba52ad29a1f7c8a73a7
| | * Fix the missing webview Qt Designer plugin.Tim Jenssen2013-01-111-2/+1
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29031 Change-Id: Ie91ec524292358388586827acbd69ec2fed44072 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | ActiveQt Designer plugin: Load control string correctly.Friedemann Kleint2013-01-211-1/+3
|/ / | | | | | | | | | | | | Task-number: QTBUG-29234 Change-Id: I5762c75efc24bf5322ff767a9dbecfdfc02c3377 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* | Update copyright year in Digia's license headersSergio Ahumada2013-01-1019-19/+19
|/ | | | | | | Change-Id: I9b11dc8309c9739955e3acea12b564d6ad608f59 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* make use of qtHaveModule()Oswald Buddenhagen2013-01-081-2/+2
| | | | | | Change-Id: I494ad22447fe54be405698f2dfd79e4941019bdc Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix position of rendered QAxWidget in designer previewMiikka Heikkinen2012-12-141-1/+1
| | | | | | | | Added correct offset to render call. Task-number: QTBUG-28595 Change-Id: Iab9fecdcf48c8f72fe28ac1cae72bcd2ea5830e9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Add PLUGIN_CLASS_NAME to qttools pluginsMiikka Heikkinen2012-12-103-0/+3
| | | | | | | | Needed for automating static plugin loading. Task-number: QTBUG-28131 Change-Id: I4e7c7b5342c7dde99580d42100c8b9d89b809515 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Remove dependency to ActiveQt sources in designer plugin.Miikka Heikkinen2012-12-071-7/+3
| | | | | | | | | | | Seems that building using qaxtypes.* directly from qtactiveqt repo is unnecessary, so remove them. Task-number: QTBUG-26848 Change-Id: I4a5e071b83697fd6ee83a742cba6ae13c8b343fb Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix build of the Designer QAxWidget plugin.Friedemann Kleint2012-12-032-4/+4
| | | | | Change-Id: I8a1e08c627f7697ca4449f0c33b1ecbda08257b4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* adjust to qt_plugin.prf changesOswald Buddenhagen2012-11-054-16/+4
| | | | | | | | | | | | DESTDIR and INSTALLS+=target are set up automatically now, but PLUGIN_TYPE needs to be defined. TEMPLATE, some CONFIG flags and TARGET munging are unnecessary, too. this contains a nasty hack for examples, as we don't want users to use the internal prf files. Change-Id: I9af75f3040fd45d87ec9daea27e00588796ebe81 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Adapt to QtWebKit module changesSimon Hausmann2012-10-153-4/+4
| | | | | | | | | | The widget specific API of QtWebKit is split out into a separate QtWebKitWidgets module. Assistant and Designer use the widget specific API and therefore need to use QT += webkitwidgets instead of QT += webkit. Change-Id: I57b829428e079f454560676c48536aae8de15ed4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Polish Qt Designer plugins and QtUiTools.Friedemann Kleint2012-10-124-8/+9
| | | | | | | | | Do not use module includes, fix warnings about obsolete CONFIG+=designer. Change-Id: I6277f0e96a35171f22dced1a434a2c14c1e98d60 Reviewed-by: Peter Kümmel <syntheticpp@gmx.net> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Build tools in release mode if using -debug-and-release optionYuchen Deng2012-09-264-13/+1
| | | | | | Change-Id: I2d0f60e2fcba66460f5488c6f66432b76a06f05a Reviewed-by: Yuchen Deng <loaden@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2519-457/+457
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: If89e41b25a242ff376eacdf8790957bcf499cc66 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix dependencies of the QtTools module.Friedemann Kleint2012-06-2017-948/+1
| | | | | | | | | - Remove phonon designer plugin. - Disable the ActiveX designer plugin, which will later be moved to the ActiveQt module. Change-Id: I36240e9d22f852c2a3bbfcb00052221adfb2e681 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix windows build due to min/max macro clashSimon Hausmann2012-06-132-0/+2
| | | | | | | | | qdatetime.h uses std::min/max and windows system headers like to redefine min/max. Include qt_windows.h instead of windows.h to include a workaround for this conflict. Change-Id: I756ebfcae2ba5540240fe7e8c7b1ad71e2a99cec Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* This plugin has moved to qtquick1Lars Knoll2012-06-085-221/+0
| | | | | | | | | | This somewhat untangles module dependencies, and removes the qtquick1 dependency from qttools. It also leads to compiling the designer plugin for a module together with the module. Change-Id: I8f18b1374ffb74a7753714b3162a67369b535c4d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove the remaining traces of the old plugin systemLars Knoll2012-05-312-2/+1
| | | | | Change-Id: Id00d34a937703c9043c2831349f6a7b15e4da724 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Update the includes after QIcon was moved to back to QtGuiOlivier Goffart2012-05-202-2/+2
| | | | | Change-Id: I103c7c48f2280b22a8b224a82a07c29ffbae3c77 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* QtTools: Fix compilation after merge of the api_changes branch.Friedemann Kleint2012-04-181-1/+1
| | | | | | | Remove Qt::LogText, fix phonon plugin. Change-Id: If51bab691d14d7caae102b60196b2d8c5b07da70 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Use "qt-project.org" instead of "trolltech" in the resource systemhjk2012-03-286-6/+6
| | | | | | Task-number: QTBUG-23272 Change-Id: I383e66291fc2c5bb431792c1b93a152a9b02462e Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* clean up qmake-generated projectsOswald Buddenhagen2012-02-214-6/+0
| | | | | | | remove "header" and assignmets which are defaults or bogus Change-Id: I300d4be1928e5a7dab0fdf1c5a56992e9960b1a4 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Adding condition for activeqt plugins to only build on win32.Toby Tomkins2012-02-211-1/+1
| | | | | | | | | Including activeqt only makes sense on win32 platforms, hence only compile them on these. Because QT_CONFIG will contain activeqt even when the module is not compiled, this needs to be explicitly set. Change-Id: I3bd66f85b3ccbd138dac22ed4e3fbd5c907f013a Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix compilation of View3d plugin.Friedemann Kleint2012-02-206-8/+21
| | | | | Change-Id: Ifb6c14b927d26f7ab5bb87d218d4be3f65e9bafc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Designer: Build ActiveQt custom widget plugin.Friedemann Kleint2012-02-202-5/+5
| | | | | | | Adapt profile and activate it in plugins.pro. Change-Id: I98378d894443521dc1d3d467338391eb53ebef2d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Use new plugin system in Qt Designer.Friedemann Kleint2012-02-1716-10/+16
| | | | | | | | - Change interface names to use the prefix "org.qt-project.Qt." - Add json files and use new macros. Change-Id: I2b0e6ac59b6dfbdced70751921a588f6e417615f Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Qt Designer: Fix compilation.Friedemann Kleint2012-02-072-2/+2
| | | | | | | | - Change module name of QDeclarativeView to quick1, remove declarative. Change-Id: I706832407151b03b26a3a34e00cee11e324a3439 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-3030-30/+30
| | | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ib4b7580dda53886247ad6eb10d17d8e67c51980d Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-2330-30/+30
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I3841a7c154b90b73fe8f498fda035c8b3545c692 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-0630-30/+30
| | | | | | Change-Id: I89fb3609f49f9a4f1e7d658b05e212febcb14c94 Sanity-Review: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Qt Designer: Fix linking of QtQuick1 plugin on Windows.Friedemann Kleint2011-11-031-1/+1
| | | | | | Change-Id: I611aef8f621a4f26cbfdeab725fd4dec03def448 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Designer: Fix string conversion warnings/introduce QStringLiteral.Friedemann Kleint2011-09-278-27/+27
| | | | | | | | on this occasion. Change-Id: Ib80dfdf8aae162b02500293a83e3bc12941f7406 Reviewed-on: http://codereview.qt-project.org/5637 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Merge remote-tracking branch 'origin/refactor' into masterLars Knoll2011-09-1310-18/+18
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/assistant/help/help.pro src/designer/src/components/formeditor/formwindow.cpp src/designer/src/components/formeditor/formwindow_dnditem.cpp src/designer/src/components/formeditor/layout_propertysheet.cpp src/designer/src/components/formeditor/qdesigner_resource.cpp src/designer/src/components/lib/lib.pro src/designer/src/components/signalsloteditor/signalsloteditor.cpp src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp src/designer/src/components/widgetbox/widgetbox_dnditem.cpp src/designer/src/components/widgetbox/widgetboxtreewidget.cpp src/designer/src/lib/lib.pro src/designer/src/lib/shared/qdesigner_formbuilder.cpp src/designer/src/lib/shared/qdesigner_propertysheet.cpp src/designer/src/lib/shared/shared.pri src/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro src/linguist/lupdate/qdeclarative.cpp src/linguist/shared/profileevaluator.cpp src/linguist/shared/qph.cpp src/linguist/shared/ts.cpp src/qtconfig/mainwindow.cpp src/shared/qtgradienteditor/qtcolorline.cpp src/shared/qtgradienteditor/qtgradientwidget.cpp sync.profile Change-Id: I53f0ce4efae4179257cbf3aab87e1af12c3aa4ff
| * QtTools: Widget library split.Friedemann Kleint2011-05-2411-19/+19
| |
* | Fixed build breakJ-P Nurmi2011-07-262-2/+2
| | | | | | | | | | | | | | | | | | QDeclarativeItem was moved from QtDeclarative to QtQuick1 Change-Id: Ic5b018ff73dbb808bbbd26d7cd7209c287d26811 Reviewed-on: http://codereview.qt.nokia.com/1562 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* | Update licenseheader text in source files for qttools Qt moduleJyri Tahtela2011-05-2430-511/+511
|/ | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Qt Designer: Remove Qt3 Widget plugins.Friedemann Kleint2011-05-0643-5546/+0
|
* Use private headersMarius Storm-Olsen2011-05-022-2/+2
|
* Introduced the QT.<module>.plugins variable to module profiles.axis2011-04-272-2/+2
|
* Made ActiveQt Designer plugin refer to right source location.axis2011-04-271-5/+6
|
* Removed activeqt references from Designer, which is in its own repo.axis2011-04-271-1/+0
|
* Added correct include paths for Designer plugins.axis2011-04-271-0/+2
|
* Initial import from the monolithic Qt.Qt by Nokia2011-04-2786-0/+9393
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
View Lorry Controller Status