feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fixed compilation due to fancylineedit change

Browse Source
This commit is contained in:
Lasse Holmstedt
2010-03-17 11:55:33 +01:00
parent ba17fb205a
commit 3fb241c858
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmlinspector/components/expressionquerywidget.cpp
View File

@@ -73,8 +73,9 @@ ExpressionQueryWidget::ExpressionQueryWidget(Mode mode, QDeclarativeEngineDebug
m_highlighter->setParent(m_textEdit->document()); m_highlighter->setParent(m_textEdit->document());
if (m_mode == SeparateEntryMode) { if (m_mode == SeparateEntryMode) {
m_lineEdit = new Utils::FancyLineEdit; m_lineEdit = new QLineEdit;
m_lineEdit->setHintText(tr("<Expression>"));
m_lineEdit->setPlaceholderText(tr("<Expression>"));
connect(m_lineEdit, SIGNAL(returnPressed()), SLOT(executeExpression())); connect(m_lineEdit, SIGNAL(returnPressed()), SLOT(executeExpression()));
QHBoxLayout *hbox = new QHBoxLayout; QHBoxLayout *hbox = new QHBoxLayout;
hbox->setMargin(1); hbox->setMargin(1);

5
src/plugins/qmlinspector/components/expressionquerywidget.h
View File

@@ -41,9 +41,6 @@ class QPlainTextEdit;
class QLineEdit; class QLineEdit;
class QPushButton; class QPushButton;
namespace Utils {
class FancyLineEdit;
}
namespace Core { namespace Core {
class IContext; class IContext;
} }
@@ -90,7 +87,7 @@ private:
QDeclarativeEngineDebug *m_client; QDeclarativeEngineDebug *m_client;
QDeclarativeDebugExpressionQuery *m_query; QDeclarativeDebugExpressionQuery *m_query;
QPlainTextEdit *m_textEdit; QPlainTextEdit *m_textEdit;
Utils::FancyLineEdit *m_lineEdit; QLineEdit *m_lineEdit;
QPushButton *m_button; QPushButton *m_button;
QString m_prompt; QString m_prompt;
QString m_expr; QString m_expr;

2
src/plugins/qmlinspector/qmlinspectorplugin.cpp
View File

@@ -106,7 +106,7 @@ bool QmlInspectorPlugin::initialize(const QStringList &arguments, QString *error
m_inspector = new QmlInspector; m_inspector = new QmlInspector;
addObject(m_inspector); addObject(m_inspector);
Core::ICore::instance()->addContextObject(m_inspector->context()); core->addContextObject(m_inspector->context());
connect(m_connectionTimer, SIGNAL(timeout()), SLOT(pollInspector())); connect(m_connectionTimer, SIGNAL(timeout()), SLOT(pollInspector()));