From 3795e2c7bec9eb50a04d139e45ecc809c4aa37f6 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 30 Aug 2011 13:15:56 +0200 Subject: Move the qmljsdebugargument variable to QGuiApplication MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/widgets/kernel/qapplication.cpp | 6 ------ src/widgets/kernel/qapplication_p.h | 2 -- 2 files changed, 8 deletions(-) (limited to 'src/widgets') diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index e597760a61..461bba5800 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -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" diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h index ae39037760..5047eb448c 100644 --- a/src/widgets/kernel/qapplication_p.h +++ b/src/widgets/kernel/qapplication_p.h @@ -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; -- cgit v1.2.3