diff options
author | Tim Jenssen <tim.jenssen@digia.com> | 2013-05-08 13:26:41 +0200 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-05-16 16:12:52 +0200 |
commit | 06449248ab638d3ebb23f03e56450f10b4acbb5c (patch) | |
tree | a4fb331a237b6ad5bcf2857f75fe689b505386a5 /src/libs/installer/messageboxhandler.cpp | |
parent | 89ee32bea7d9cdfb426d3400e940a6b006b2b2f7 (diff) |
introduce installerscriptengine
- it uses one scriptengine for everything and adds the components
or/and the install-controller in javascript closure contexts
- added the gui object to the component script context
- removed tabController from controlscript context
Change-Id: I3bd6c5dcf470666c30add1b7d04a8fdd094f5f11
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'src/libs/installer/messageboxhandler.cpp')
-rw-r--r-- | src/libs/installer/messageboxhandler.cpp | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/src/libs/installer/messageboxhandler.cpp b/src/libs/installer/messageboxhandler.cpp index 9905e024d..69fc62570 100644 --- a/src/libs/installer/messageboxhandler.cpp +++ b/src/libs/installer/messageboxhandler.cpp @@ -47,10 +47,6 @@ #include <QDialogButtonBox> #include <QPushButton> -#include <QScriptEngine> -#include <QScriptValue> -#include <QMetaEnum> - /*! \qmltype QMessageBox \inqmlmodule scripting @@ -134,29 +130,6 @@ Opens a warning message box with the given \a title and \a text. */ -QScriptValue QInstaller::registerMessageBox(QScriptEngine *scriptEngine) -{ - // register QMessageBox::StandardButton enum in the script connection - QScriptValue messageBox = scriptEngine->newQObject(MessageBoxHandler::instance()); - - const QMetaObject &messageBoxMetaObject = QMessageBox::staticMetaObject; - int index = messageBoxMetaObject.indexOfEnumerator("StandardButtons"); - - QMetaEnum metaEnum = messageBoxMetaObject.enumerator(index); - for (int i = 0; i < metaEnum.keyCount(); i++) { - int enumValue = metaEnum.value(i); - if (enumValue < QMessageBox::FirstButton) - continue; - messageBox.setProperty(QString::fromLatin1(metaEnum.valueToKey(metaEnum.value(i))), - scriptEngine->newVariant(enumValue)); - if (enumValue == QMessageBox::LastButton) - break; - } - scriptEngine->globalObject().setProperty(QLatin1String("QMessageBox"), messageBox); - - return messageBox; -} - using namespace QInstaller; // -- MessageBoxHandler |