diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-06 16:19:14 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-06 16:50:03 +0200 |
| commit | 1326cd15f7ba985551f0fddc717e3bfc01ddda85 (patch) | |
| tree | 024eb871ed5f4e8c02e21412475e6e9929a2b030 /src/widgets/kernel/qapplication.cpp | |
| parent | fe70367fe06984d1ac84cc276ca3fd3edc4193c7 (diff) | |
| parent | beb7258a56b6ec76531b73cc07ee30132a3f548f (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
mkspecs/qnx-x86-qcc/qplatformdefs.h
src/corelib/global/qglobal.h
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qgl.cpp
src/opengl/qglpixelbuffer.cpp
src/opengl/qglshaderprogram.cpp
tests/auto/opengl/qglthreads/tst_qglthreads.cpp
Change-Id: Iaba137884d3526a139000ca26fee02bb27b5cdb5
Diffstat (limited to 'src/widgets/kernel/qapplication.cpp')
| -rw-r--r-- | src/widgets/kernel/qapplication.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 8d0a51606e..9c2c2bab16 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -337,6 +337,15 @@ QApplicationPrivate::~QApplicationPrivate() */ /*! + \fn QApplication::setGraphicsSystem(const QString &) + \obsolete + + This call has no effect. + + Use the QPA framework instead. +*/ + +/*! \fn QWidget *QApplication::topLevelAt(const QPoint &point) Returns the top-level widget at the given \a point; returns 0 if @@ -360,6 +369,7 @@ QApplicationPrivate::~QApplicationPrivate() void qt_init(QApplicationPrivate *priv, int type ); +void qt_init_tooltip_palette(); void qt_cleanup(); QStyle *QApplicationPrivate::app_style = 0; // default application style @@ -4022,6 +4032,7 @@ void QApplicationPrivate::notifyThemeChanged() QGuiApplicationPrivate::notifyThemeChanged(); clearSystemPalette(); initSystemPalette(); + qt_init_tooltip_palette(); } #ifndef QT_NO_DRAGANDDROP |