diff options
| author | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2014-01-22 14:00:38 +0100 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2014-01-22 14:30:43 +0100 |
| commit | 8cd02686c7da8ec6113549f1a77034ccc9fe8165 (patch) | |
| tree | 5868db33de8d2f2ed3454b6bb10163ced4245182 | |
| parent | f206d8bae59bbbb6c2def79ddf390181c54dc46f (diff) | |
| download | qt-creator-8cd02686c7da8ec6113549f1a77034ccc9fe8165.tar.gz | |
QmlDesigner.PropertyEditor: Using :ICore::mainWindow() for dialogs
Since the current focus is on (native) QtQuickView window we have to
specify the Qt Creator main window.
Task-number: QTCREATORBUG-11322
Change-Id: I0e05efaa88b6177004730cd8c43010568cf64eac
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
| -rw-r--r-- | src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp b/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp index 7ebfa5d645..6e3a1e90f8 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp @@ -29,6 +29,8 @@ #include "fileresourcesmodel.h" +#include <coreplugin/icore.h> + #include <model.h> #include <QFileDialog> @@ -130,7 +132,7 @@ void FileResourcesModel::openFileDialog() if (!QFileInfo(path).exists()) path = modelPath; - QString newFile = QFileDialog::getOpenFileName(0, tr("Open File"), path, m_filter); + QString newFile = QFileDialog::getOpenFileName(Core::ICore::mainWindow(), tr("Open File"), path, m_filter); if (!newFile.isEmpty()) { setFileNameStr(newFile); |