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

Cannot input Korean in FromEditor/Property panel

Browse Source 
Warkaround suggested by Eskil Abrahamsen Blomfeldt, using QQuickWindow
instead of QQuickWidget

Task-number: QDS-2350
Change-Id: I794cb48cf4f6b57ed928e76c0dca442c6f39ff0c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Lukasz Ornatek
2020-09-02 13:22:09 +02:00
committed by Łukasz Ornatek
parent b5e51e4f97
commit df696a34b5
3 changed files with 17 additions and 6 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; return m_view->widget();
} }
void PropertyEditorQmlBackend::setSource(const QUrl& url) { void PropertyEditorQmlBackend::setSource(const QUrl& url) {

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

@@ -45,10 +45,16 @@
namespace QmlDesigner { namespace QmlDesigner {
Quick2PropertyEditorView::Quick2PropertyEditorView(QWidget *parent) : Quick2PropertyEditorView::Quick2PropertyEditorView(QWidget *parent) :
QQuickWidget(parent) QQuickView()
{ {
setResizeMode(QQuickWidget::SizeRootObjectToView); setResizeMode(QQuickView::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()
@@ -98,7 +104,7 @@ bool Quick2PropertyEditorView::event(QEvent *e)
} }
} }
return QQuickWidget::event(e); return QQuickView::event(e);
} }
} //QmlDesigner } //QmlDesigner

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

@@ -25,22 +25,27 @@
#pragma once #pragma once
#include <QQuickWidget> #include <QQuickView>
namespace QmlDesigner { namespace QmlDesigner {
class Quick2PropertyEditorView : public QQuickWidget class Quick2PropertyEditorView : public QQuickView
{ {
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