aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner
Commit message (Expand)AuthorAgeFilesLines
* QmlDesigner: CrashfixThomas Hartmann2014-11-061-4/+5
* QmlDesigner: Followup on name changeThomas Hartmann2014-11-049-40/+40
* Use QFileInfo::exist(f) instead of QFileInfo(f).exists() if possiblehjk2014-11-034-6/+6
* License update.Eike Ziller2014-10-159-57/+65
* QmlDesigner: Add support for .ui.qmlThomas Hartmann2014-10-152-3/+13
* Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-10-14434-3038/+3472
|\
| * License updateEike Ziller2014-10-09435-3042/+3476
* | Add ui.qml support to code mode and editorFawzi Mohamed2014-10-141-0/+1
* | TextEditor: Rename BaseTextEditorWidget to TextEditorWidgethjk2014-09-293-6/+6
* | QmlDesigner: Use QQuickWidget againTim Jenssen2014-09-267-146/+46
* | TextEditor: More BaseText* -> Text* renamingshjk2014-09-261-1/+1
* | Rename {Core,TextEditor},{Base,}TextDocument classeshjk2014-09-251-1/+1
* | Use Q_DECL_OVERRIDE instead of QTC_OVERRIDEThomas Hartmann2014-09-2519-394/+393
* | QmlJSEditor: cleaning up dependencies to QmlDesignerThomas Hartmann2014-09-251-2/+0
* | Doc: fix tooltips for Qt Quick ControlsLeena Miettinen2014-09-175-10/+10
* | QmlDesigner: Fix compiler warningsOrgad Shaneh2014-09-172-23/+1
* | Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-09-1624-154/+351
|\|
| * QmlDesigner.PropertyEditor: Fix regression in SliderSpecificsThomas Hartmann2014-09-111-1/+1
| * QmlDesigner.Instances: Do not use Qt kit for fallback puppetThomas Hartmann2014-09-111-1/+2
| * Doc: fix labels and tooltipsLeena Miettinen2014-09-112-14/+14
| * QmlJS: Add error message for invalid root item in the designerThomas Hartmann2014-09-101-0/+1
| * QmlDesigner: Adding UI option for fallback puppet.Thomas Hartmann2014-09-103-27/+48
| * QmlDesigner.TextToModelMerger: Fixing comparison of QVariantThomas Hartmann2014-09-091-0/+2
| * QmlDesigner: add more specificsTim Jenssen2014-09-097-62/+266
| * QmlDesigner.Navigator: Fix reordering in case of invisble nodesThomas Hartmann2014-09-083-30/+7
| * QmlDesigner.Navigator: Crash fixThomas Hartmann2014-09-081-1/+3
| * QmlDesigner: Fix regression for import pathsThomas Hartmann2014-09-0810-33/+22
* | use DISTFILES instead of OTHER_FILES in creator's own build systemOswald Buddenhagen2014-09-152-2/+2
* | Project Explorer: fix possible nullptr derefs and remove deadErik Verbruggen2014-09-111-1/+1
* | QmlDesigner: clean up QWeakPointer useTim Jenssen2014-09-054-8/+7
* | Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-09-037-14/+18
|\|
| * qmljs: fixing used importsFawzi Mohamed2014-08-281-1/+1
| * QmlDesigner.MetaInfo: Avoid duplicated propertiesThomas Hartmann2014-08-281-2/+4
| * QmlDesigner: Fix typoThomas Hartmann2014-08-271-1/+1
| * QmlDesigner: fix that we have too many updateActiveQtVersion() connectionsTim Jenssen2014-08-221-4/+3
| * QmlDesigner.NavigatorView: Do not set a position for new itemsThomas Hartmann2014-08-212-4/+6
| * QmlDesigner.Rewriter: Adding missing global Qt enumsThomas Hartmann2014-08-211-1/+2
| * QmlDesigner.PropertyEditor: Fix captionThomas Hartmann2014-08-211-1/+1
* | ExtensionSystem: Use Qt 5 plugin metadata instead of .pluginspec filesEike Ziller2014-09-022-26/+26
* | Fix library and plugin pathsEike Ziller2014-09-022-4/+4
* | QmlDesigner: Remove remaining BaseTextEditor::editor() usehjk2014-09-011-3/+2
* | Do not use deprecated Qt functionality.Christian Kandeler2014-08-2910-12/+30
* | ExtensionSystem: Remove Qt4 supportEike Ziller2014-08-273-10/+0
* | Use Qt 5's QStringList::join(QChar)hjk2014-08-254-5/+5
* | Add copyright commentNikolai Kosjar2014-08-228-0/+231
* | Fix closing editor with ctrl+w or "x" or File > CloseEike Ziller2014-08-221-1/+1
* | EditorManager: closeOtherEditors --> closeOtherDocumentsEike Ziller2014-08-181-1/+1
* | Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-08-1529-128/+239
|\|
| * QmlDesigner.ImportManager: Fix comparison operatorThomas Hartmann2014-08-151-0/+3
| * QmlDesigner.FormeEditor: Crash fixThomas Hartmann2014-08-151-1/+1