diff --git a/src/plugins/qmlinspector/components/expressionquerywidget.cpp b/src/plugins/qmlinspector/components/expressionquerywidget.cpp
index 7e0562415c102293536064f4c6c5ec140cd240e3..92935fdd74ab1c4f1033e2bf3ecf7b980b00e191 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 8a55d1c63879f720182f2e789bb8225582f970bc..2e188f3137c3fd8babc6c6c85d609528d86119f4 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 e24cb3a085905b1a025d812f1f87be24228dad1e..0fb3ec8cd60f6400db33778393dd4925468110aa 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()));