From 3fb241c858c7f7cb0f004d0c95cc3c7163d1b50e Mon Sep 17 00:00:00 2001
From: Lasse Holmstedt <lasse.holmstedt@nokia.com>
Date: Wed, 17 Mar 2010 11:55:33 +0100
Subject: [PATCH] Fixed compilation due to fancylineedit change
---
.../qmlinspector/components/expressionquerywidget.cpp | 5 +++--
src/plugins/qmlinspector/components/expressionquerywidget.h | 5 +----
src/plugins/qmlinspector/qmlinspectorplugin.cpp | 2 +-
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/plugins/qmlinspector/components/expressionquerywidget.cpp b/src/plugins/qmlinspector/components/expressionquerywidget.cpp
index 7e0562415c1..92935fdd74a 100644
--- a/src/plugins/qmlinspector/components/expressionquerywidget.cpp
+++ b/src/plugins/qmlinspector/components/expressionquerywidget.cpp
@@ -73,8 +73,9 @@ ExpressionQueryWidget::ExpressionQueryWidget(Mode mode, QDeclarativeEngineDebug
m_highlighter->setParent(m_textEdit->document());
if (m_mode == SeparateEntryMode) {
- m_lineEdit = new Utils::FancyLineEdit;
- m_lineEdit->setHintText(tr("<Expression>"));
+ m_lineEdit = new QLineEdit;
+
+ m_lineEdit->setPlaceholderText(tr("<Expression>"));
connect(m_lineEdit, SIGNAL(returnPressed()), SLOT(executeExpression()));
QHBoxLayout *hbox = new QHBoxLayout;
hbox->setMargin(1);
diff --git a/src/plugins/qmlinspector/components/expressionquerywidget.h b/src/plugins/qmlinspector/components/expressionquerywidget.h
index 8a55d1c6387..2e188f3137c 100644
--- a/src/plugins/qmlinspector/components/expressionquerywidget.h
+++ b/src/plugins/qmlinspector/components/expressionquerywidget.h
@@ -41,9 +41,6 @@ class QPlainTextEdit;
class QLineEdit;
class QPushButton;
-namespace Utils {
- class FancyLineEdit;
-}
namespace Core {
class IContext;
}
@@ -90,7 +87,7 @@ private:
QDeclarativeEngineDebug *m_client;
QDeclarativeDebugExpressionQuery *m_query;
QPlainTextEdit *m_textEdit;
- Utils::FancyLineEdit *m_lineEdit;
+ QLineEdit *m_lineEdit;
QPushButton *m_button;
QString m_prompt;
QString m_expr;
diff --git a/src/plugins/qmlinspector/qmlinspectorplugin.cpp b/src/plugins/qmlinspector/qmlinspectorplugin.cpp
index e24cb3a0859..0fb3ec8cd60 100644
--- a/src/plugins/qmlinspector/qmlinspectorplugin.cpp
+++ b/src/plugins/qmlinspector/qmlinspectorplugin.cpp
@@ -106,7 +106,7 @@ bool QmlInspectorPlugin::initialize(const QStringList &arguments, QString *error
m_inspector = new QmlInspector;
addObject(m_inspector);
- Core::ICore::instance()->addContextObject(m_inspector->context());
+ core->addContextObject(m_inspector->context());
connect(m_connectionTimer, SIGNAL(timeout()), SLOT(pollInspector()));
--
GitLab