feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Revert "Cannot input Korean in FromEditor/Property panel"

Browse Source 
This reverts commit df696a34b5.

The commit breaks functionality of Controls in the Property Editor.
* No longer possible to go into edit mode by clicking on a SpinBox
* Drag manipulation is not working on a SpinBox
* Non editable ComboBox can't be opened by clicking on the value

Change-Id: I330fb96b4c72eba72a5a9716a211397dd0c6b8e9
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Henning Gruendl
2020-09-16 14:12:55 +02:00
committed by Thomas Hartmann
parent 39e5d60570
commit b7bf3dd5fe
3 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
View File

@@ -361,7 +361,7 @@ PropertyEditorContextObject* PropertyEditorQmlBackend::contextObject() {
} }
QWidget *PropertyEditorQmlBackend::widget() { QWidget *PropertyEditorQmlBackend::widget() {
return m_view->widget(); return m_view;
} }
void PropertyEditorQmlBackend::setSource(const QUrl& url) { void PropertyEditorQmlBackend::setSource(const QUrl& url) {

12
src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.cpp
View File

@@ -45,16 +45,10 @@
namespace QmlDesigner { namespace QmlDesigner {
Quick2PropertyEditorView::Quick2PropertyEditorView(QWidget *parent) : Quick2PropertyEditorView::Quick2PropertyEditorView(QWidget *parent) :
QQuickView() QQuickWidget(parent)
{ {
setResizeMode(QQuickView::SizeRootObjectToView); setResizeMode(QQuickWidget::SizeRootObjectToView);
Theme::setupTheme(engine()); Theme::setupTheme(engine());
m_widget = QWidget::createWindowContainer(this, parent);
}
QWidget *Quick2PropertyEditorView::widget()
{
return m_widget;
} }
void Quick2PropertyEditorView::registerQmlTypes() void Quick2PropertyEditorView::registerQmlTypes()
@@ -104,7 +98,7 @@ bool Quick2PropertyEditorView::event(QEvent *e)
} }
} }
return QQuickView::event(e); return QQuickWidget::event(e);
} }
} //QmlDesigner } //QmlDesigner

9
src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.h
View File

@@ -25,27 +25,22 @@
#pragma once #pragma once
#include <QQuickView> #include <QQuickWidget>
namespace QmlDesigner { namespace QmlDesigner {
class Quick2PropertyEditorView : public QQuickView class Quick2PropertyEditorView : public QQuickWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit Quick2PropertyEditorView(QWidget *parent = nullptr); explicit Quick2PropertyEditorView(QWidget *parent = nullptr);
QWidget *widget();
static void registerQmlTypes(); static void registerQmlTypes();
protected: protected:
bool event(QEvent *e) override; bool event(QEvent *e) override;
private:
QWidget *m_widget;
}; };
} //QmlDesigner } //QmlDesigner