mirror of https://github.com/qt/qtbase.git
Move the qmljsdebugargument variable to QGuiApplication
This used to reside in QApplication, but we need it here to remove a dependency of QtDeclarative onto widgets. Change-Id: I119fef1d51387087b00e08aff1ee4b00503a6cd5 Reviewed-on: http://codereview.qt.nokia.com/3926 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
This commit is contained in:
parent
0e3ac5dea6
commit
3795e2c7be
|
@ -176,6 +176,10 @@ public:
|
|||
static QFont *app_font;
|
||||
|
||||
static bool quitOnLastWindowClosed;
|
||||
|
||||
QString qmljs_debug_arguments; // a string containing arguments for js/qml debugging.
|
||||
inline QString qmljsDebugArgumentsString() { return qmljs_debug_arguments; }
|
||||
|
||||
private:
|
||||
void init();
|
||||
|
||||
|
|
|
@ -486,7 +486,6 @@ bool QApplicationPrivate::fade_tooltip = false;
|
|||
bool QApplicationPrivate::animate_toolbox = false;
|
||||
bool QApplicationPrivate::widgetCount = false;
|
||||
bool QApplicationPrivate::load_testability = false;
|
||||
QString QApplicationPrivate::qmljs_debug_arguments;
|
||||
#ifdef QT_KEYPAD_NAVIGATION
|
||||
# ifdef Q_OS_SYMBIAN
|
||||
Qt::NavigationMode QApplicationPrivate::navigationMode = Qt::NavigationModeKeypadDirectional;
|
||||
|
@ -5620,11 +5619,6 @@ QGestureManager* QGestureManager::instance()
|
|||
}
|
||||
#endif // QT_NO_GESTURES
|
||||
|
||||
QString QApplicationPrivate::qmljsDebugArgumentsString()
|
||||
{
|
||||
return qmljs_debug_arguments;
|
||||
}
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#include "moc_qapplication.cpp"
|
||||
|
|
|
@ -438,8 +438,6 @@ public:
|
|||
static bool animate_toolbox;
|
||||
static bool widgetCount; // Coupled with -widgetcount switch
|
||||
static bool load_testability; // Coupled with -testability switch
|
||||
static QString qmljs_debug_arguments; // a string containing arguments for js/qml debugging.
|
||||
static QString qmljsDebugArgumentsString(); // access string from other libraries
|
||||
|
||||
#ifdef Q_WS_MAC
|
||||
static bool native_modal_dialog_active;
|
||||
|
|
Loading…
Reference in New Issue