Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 02:42:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdeclarative: use scriptools instead of qml debugger when build against Katie

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2015-11-28 04:22:15 +02:00
parent e178fea6ae
commit 06585e4340
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
kdeclarative/kdeclarative.cpp
View file

@ -172,6 +172,22 @@ void KDeclarative::setupBindings()
// setup ImageProvider for KDE icons
d->declarativeEngine.data()->addImageProvider(QString("icon"), new KIconProvider);
if (KCmdLineArgs::parsedArgs("qt")->isSet("qmljsdebugger")) {
#ifdef QT_KATIE
QScriptEngineDebugger debugger;
debugger.attachTo(engine);
QMainWindow *dbgwindow = debugger.standardWindow();
QWidget *dbgwidget = new QWidget();
QGridLayout *dbglayout = new QGridLayout();
dbglayout->addWidget(debugger.widget(QScriptEngineDebugger::CodeWidget));
dbglayout->addWidget(debugger.widget(QScriptEngineDebugger::ConsoleWidget));
dbglayout->addWidget(debugger.widget(QScriptEngineDebugger::ErrorLogWidget));
dbgwidget->setLayout(dbglayout);
dbgwindow->setCentralWidget(dbgwidget);
dbgwindow->show();
#endif
}
}
QScriptEngine *KDeclarative::scriptEngine() const
@ -184,18 +200,6 @@ void KDeclarative::setupQmlJsDebugger()
if (KCmdLineArgs::parsedArgs("qt")->isSet("qmljsdebugger")) {
#ifndef QT_KATIE
QDeclarativeDebuggingEnabler enabler;
#else
QScriptEngineDebugger debugger;
debugger.attachTo(d->declarativeEngine);
QMainWindow *dbgwindow = debugger.standardWindow();
QWidget *dbgwidget = new QWidget();
QGridLayout *dbglayout = new QGridLayout();
dbglayout->addWidget(debugger.widget(QScriptEngineDebugger::CodeWidget));
dbglayout->addWidget(debugger.widget(QScriptEngineDebugger::ConsoleWidget));
dbglayout->addWidget(debugger.widget(QScriptEngineDebugger::ErrorLogWidget));
dbgwidget->setLayout(dbglayout);
dbgwindow->setCentralWidget(dbgwidget);
dbgwindow->show();
#endif
}
}