diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/guikernel/guikernel.pri | 2 | ||||
-rw-r--r-- | src/gui/guikernel/qguiapplication.cpp | 17 | ||||
-rw-r--r-- | src/gui/guikernel/qguiapplication.h | 3 | ||||
-rw-r--r-- | src/gui/guikernel/qguiapplication_p.h | 2 | ||||
-rw-r--r-- | src/gui/guikernel/qpalette.cpp (renamed from src/gui/kernel/qpalette.cpp) | 6 | ||||
-rw-r--r-- | src/gui/guikernel/qpalette.h (renamed from src/gui/kernel/qpalette.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/kernel.pri | 6 | ||||
-rw-r--r-- | src/gui/kernel/qapplication.cpp | 12 | ||||
-rw-r--r-- | src/gui/kernel/qapplication.h | 2 | ||||
-rw-r--r-- | src/gui/kernel/qapplication_p.h | 1 |
10 files changed, 30 insertions, 21 deletions
diff --git a/src/gui/guikernel/guikernel.pri b/src/gui/guikernel/guikernel.pri index 0a4e4d557d..9d9f12634a 100644 --- a/src/gui/guikernel/guikernel.pri +++ b/src/gui/guikernel/guikernel.pri @@ -14,6 +14,7 @@ HEADERS += \ guikernel/qkeysequence_p.h \ guikernel/qkeymapper_p.h \ guikernel/qmime.h \ + guikernel/qpalette.h \ guikernel/qsessionmanager.h \ guikernel/qwindowdefs.h \ @@ -25,6 +26,7 @@ SOURCES += \ guikernel/qkeymapper.cpp \ guikernel/qkeymapper_qpa.cpp \ guikernel/qmime.cpp \ + guikernel/qpalette.cpp \ guikernel/qguivariant.cpp \ qpa { diff --git a/src/gui/guikernel/qguiapplication.cpp b/src/gui/guikernel/qguiapplication.cpp index 556f3d8798..ed3b4c28b0 100644 --- a/src/gui/guikernel/qguiapplication.cpp +++ b/src/gui/guikernel/qguiapplication.cpp @@ -82,6 +82,8 @@ QPlatformIntegration *QGuiApplicationPrivate::platform_integration = 0; bool QGuiApplicationPrivate::app_do_modal = false; +QPalette *QGuiApplicationPrivate::app_pal = 0; // default application palette + int qt_last_x = 0; int qt_last_y = 0; @@ -145,6 +147,9 @@ QGuiApplication::~QGuiApplication() delete QGuiApplicationPrivate::qt_clipboard; QGuiApplicationPrivate::qt_clipboard = 0; + delete QGuiApplicationPrivate::app_pal; + QGuiApplicationPrivate::app_pal = 0; + #ifndef QT_NO_CURSOR d->cursor_list.clear(); #endif @@ -610,6 +615,18 @@ QClipboard * QGuiApplication::clipboard() } #endif +/*! + Returns the application palette. + + \sa setPalette(), QWidget::palette() +*/ +QPalette QGuiApplication::palette() +{ + if (!QGuiApplicationPrivate::app_pal) + QGuiApplicationPrivate::app_pal = new QPalette(Qt::black); + return *QGuiApplicationPrivate::app_pal; +} + QFont QGuiApplication::font() { QMutexLocker locker(applicationFontMutex()); diff --git a/src/gui/guikernel/qguiapplication.h b/src/gui/guikernel/qguiapplication.h index 74c1034baf..1b2484519c 100644 --- a/src/gui/guikernel/qguiapplication.h +++ b/src/gui/guikernel/qguiapplication.h @@ -56,6 +56,7 @@ QT_MODULE(Gui) class QGuiApplicationPrivate; class QPlatformNativeInterface; +class QPalette; #if defined(qApp) #undef qApp @@ -94,6 +95,8 @@ public: static QClipboard *clipboard(); #endif + static QPalette palette(); + static Qt::KeyboardModifiers keyboardModifiers(); static Qt::MouseButtons mouseButtons(); diff --git a/src/gui/guikernel/qguiapplication_p.h b/src/gui/guikernel/qguiapplication_p.h index 7305e8c51a..dfe73a4c69 100644 --- a/src/gui/guikernel/qguiapplication_p.h +++ b/src/gui/guikernel/qguiapplication_p.h @@ -147,6 +147,8 @@ public: static QClipboard *qt_clipboard; #endif + static QPalette *app_pal; + static QWindowList window_list; #ifndef QT_NO_CURSOR diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/guikernel/qpalette.cpp index f0117b46e5..33b1c2a2a8 100644 --- a/src/gui/kernel/qpalette.cpp +++ b/src/gui/guikernel/qpalette.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qpalette.h" -#include "qapplication.h" +#include "qguiapplication.h" #include "qdatastream.h" #include "qvariant.h" @@ -336,7 +336,7 @@ static QColor qt_mix_colors(QColor a, QColor b) roles are enumerated and defined in the \l ColorRole documentation. We strongly recommend that you use the default palette of the - current style (returned by QApplication::palette()) and + current style (returned by QGuiApplication::palette()) and modify that as necessary. This is done by Qt's widgets when they are drawn. @@ -487,7 +487,7 @@ static QColor qt_mix_colors(QColor a, QColor b) \sa QApplication::setPalette(), QApplication::palette() */ QPalette::QPalette() - : d(QApplication::palette().d), + : d(QGuiApplication::palette().d), current_group(Active), resolve_mask(0) { diff --git a/src/gui/kernel/qpalette.h b/src/gui/guikernel/qpalette.h index 17f3d0f653..17f3d0f653 100644 --- a/src/gui/kernel/qpalette.h +++ b/src/gui/guikernel/qpalette.h diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index d32533dbc1..4788252285 100644 --- a/src/gui/kernel/kernel.pri +++ b/src/gui/kernel/kernel.pri @@ -26,8 +26,7 @@ HEADERS += \ kernel/qlayoutengine_p.h \ kernel/qlayoutitem.h \ kernel/qsizepolicy.h \ - kernel/qpalette.h \ - kernel/qstackedlayout.h \ + kernel/qstackedlayout.h \ kernel/qtooltip.h \ kernel/qwhatsthis.h \ kernel/qwidget.h \ @@ -58,8 +57,7 @@ SOURCES += \ kernel/qlayout.cpp \ kernel/qlayoutengine.cpp \ kernel/qlayoutitem.cpp \ - kernel/qpalette.cpp \ - kernel/qstackedlayout.cpp \ + kernel/qstackedlayout.cpp \ kernel/qtooltip.cpp \ kernel/qwhatsthis.cpp \ kernel/qwidget.cpp \ diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 9a9d46db5a..2044cf78ce 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -443,7 +443,6 @@ QString QApplicationPrivate::styleSheet; // default application styles QPointer<QWidget> QApplicationPrivate::leaveAfterRelease = 0; int QApplicationPrivate::app_cspec = QApplication::NormalColor; -QPalette *QApplicationPrivate::app_pal = 0; // default application palette QPalette *QApplicationPrivate::sys_pal = 0; // default system palette QPalette *QApplicationPrivate::set_pal = 0; // default palette set by programmer @@ -1678,17 +1677,6 @@ void QApplication::setGlobalStrut(const QSize& strut) QApplicationPrivate::app_strut = strut; } -/*! - Returns the application palette. - - \sa setPalette(), QWidget::palette() -*/ -QPalette QApplication::palette() -{ - if (!QApplicationPrivate::app_pal) - QApplicationPrivate::app_pal = new QPalette(Qt::black); - return *QApplicationPrivate::app_pal; -} /*! \fn QPalette QApplication::palette(const QWidget* widget) diff --git a/src/gui/kernel/qapplication.h b/src/gui/kernel/qapplication.h index 9db3b57030..3a5f02f144 100644 --- a/src/gui/kernel/qapplication.h +++ b/src/gui/kernel/qapplication.h @@ -156,7 +156,7 @@ public: // ### Qt4 compatibility, remove? static inline void setGraphicsSystem(const QString &) {} - static QPalette palette(); + using QGuiApplication::palette; static QPalette palette(const QWidget *); static QPalette palette(const char *className); static void setPalette(const QPalette &, const char* className = 0); diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h index 97106dc54d..a089a6ba40 100644 --- a/src/gui/kernel/qapplication_p.h +++ b/src/gui/kernel/qapplication_p.h @@ -402,7 +402,6 @@ public: static QWidgetList *popupWidgets; static QStyle *app_style; static int app_cspec; - static QPalette *app_pal; static QPalette *sys_pal; static QPalette *set_pal; |