diff options
Diffstat (limited to 'src/plugins/qmljseditor')
-rw-r--r-- | src/plugins/qmljseditor/qmljseditor.qbs | 2 | ||||
-rw-r--r-- | src/plugins/qmljseditor/qmljsfindreferences.cpp | 3 | ||||
-rw-r--r-- | src/plugins/qmljseditor/qmljspreviewrunner.cpp | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/qmljseditor/qmljseditor.qbs b/src/plugins/qmljseditor/qmljseditor.qbs index 51e7c82c5c..67f23d2fc0 100644 --- a/src/plugins/qmljseditor/qmljseditor.qbs +++ b/src/plugins/qmljseditor/qmljseditor.qbs @@ -1,4 +1,4 @@ -import qbs.base 1.0 +import qbs 1.0 import QtcPlugin diff --git a/src/plugins/qmljseditor/qmljsfindreferences.cpp b/src/plugins/qmljseditor/qmljsfindreferences.cpp index d2e2e4e875..b92341637d 100644 --- a/src/plugins/qmljseditor/qmljsfindreferences.cpp +++ b/src/plugins/qmljseditor/qmljsfindreferences.cpp @@ -929,7 +929,8 @@ void FindReferences::displayResults(int first, int last) label, QString(), symbolName, Core::SearchResultWindow::SearchOnly); } else { m_currentSearch = Core::SearchResultWindow::instance()->startNewSearch( - label, QString(), symbolName, Core::SearchResultWindow::SearchAndReplace); + label, QString(), symbolName, Core::SearchResultWindow::SearchAndReplace, + Core::SearchResultWindow::PreserveCaseDisabled); m_currentSearch->setTextToReplace(replacement); connect(m_currentSearch, SIGNAL(replaceButtonClicked(QString,QList<Core::SearchResultItem>,bool)), SLOT(onReplaceButtonClicked(QString,QList<Core::SearchResultItem>,bool))); diff --git a/src/plugins/qmljseditor/qmljspreviewrunner.cpp b/src/plugins/qmljseditor/qmljspreviewrunner.cpp index a6932185b0..6a31fd6320 100644 --- a/src/plugins/qmljseditor/qmljspreviewrunner.cpp +++ b/src/plugins/qmljseditor/qmljspreviewrunner.cpp @@ -29,6 +29,8 @@ #include "qmljspreviewrunner.h" +#include <coreplugin/icore.h> + #include <utils/environment.h> #include <utils/hostosinfo.h> #include <utils/qtcprocess.h> @@ -71,7 +73,7 @@ void QmlJSPreviewRunner::run(const QString &filename) } if (!errorMessage.isEmpty()) - QMessageBox::warning(0, tr("Failed to preview Qt Quick file"), + QMessageBox::warning(Core::ICore::dialogParent(), tr("Failed to preview Qt Quick file"), tr("Could not preview Qt Quick (QML) file. Reason:\n%1").arg(errorMessage)); } |