forked from qt-creator/qt-creator
Cannot input Korean in FromEditor/Property panel
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:
committed by
Łukasz Ornatek
parent
b5e51e4f97
commit
df696a34b5
@@ -361,7 +361,7 @@ PropertyEditorContextObject* PropertyEditorQmlBackend::contextObject() {
|
||||
}
|
||||
|
||||
QWidget *PropertyEditorQmlBackend::widget() {
|
||||
return m_view;
|
||||
return m_view->widget();
|
||||
}
|
||||
|
||||
void PropertyEditorQmlBackend::setSource(const QUrl& url) {
|
||||
|
||||
@@ -45,10 +45,16 @@
|
||||
namespace QmlDesigner {
|
||||
|
||||
Quick2PropertyEditorView::Quick2PropertyEditorView(QWidget *parent) :
|
||||
QQuickWidget(parent)
|
||||
QQuickView()
|
||||
{
|
||||
setResizeMode(QQuickWidget::SizeRootObjectToView);
|
||||
setResizeMode(QQuickView::SizeRootObjectToView);
|
||||
Theme::setupTheme(engine());
|
||||
m_widget = QWidget::createWindowContainer(this, parent);
|
||||
}
|
||||
|
||||
QWidget *Quick2PropertyEditorView::widget()
|
||||
{
|
||||
return m_widget;
|
||||
}
|
||||
|
||||
void Quick2PropertyEditorView::registerQmlTypes()
|
||||
@@ -98,7 +104,7 @@ bool Quick2PropertyEditorView::event(QEvent *e)
|
||||
}
|
||||
}
|
||||
|
||||
return QQuickWidget::event(e);
|
||||
return QQuickView::event(e);
|
||||
}
|
||||
|
||||
} //QmlDesigner
|
||||
|
||||
@@ -25,22 +25,27 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QQuickWidget>
|
||||
#include <QQuickView>
|
||||
|
||||
|
||||
namespace QmlDesigner {
|
||||
|
||||
class Quick2PropertyEditorView : public QQuickWidget
|
||||
class Quick2PropertyEditorView : public QQuickView
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit Quick2PropertyEditorView(QWidget *parent = nullptr);
|
||||
|
||||
QWidget *widget();
|
||||
|
||||
static void registerQmlTypes();
|
||||
|
||||
protected:
|
||||
bool event(QEvent *e) override;
|
||||
|
||||
private:
|
||||
QWidget *m_widget;
|
||||
};
|
||||
|
||||
} //QmlDesigner
|
||||
|
||||
Reference in New Issue
Block a user