whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Squash un-needed qt_init function into callsite 

Only uses a single place and avoids following the init logic through
multiple layers when trying to debug it.

Change-Id: I8fc119385edf407f69fb5431dc6584288022a7fe
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Tor Arne Vestbø 2019-06-21 13:05:23 +02:00
parent d848c3dfea
commit cea661d395
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/widgets/kernel/qapplication.cpp
View File

@ -381,8 +381,6 @@ QWidget *QApplication::topLevelAt(const QPoint &pos)
0 if there is no such widget.
*/
void qt_init(QApplicationPrivate *priv, int type
);
void qt_init_tooltip_palette();
void qt_cleanup();
@ -571,7 +569,10 @@ void QApplicationPrivate::init()
process_cmdline();
// Must be called before initialize()
qt_init(this, application_type);
QColormap::initialize();
qt_init_tooltip_palette();
QApplicationPrivate::initializeWidgetFontHash();
initialize();
eventDispatcher->startingUp();
@ -586,18 +587,6 @@ void QApplicationPrivate::init()
}
void qt_init(QApplicationPrivate *priv, int type)
{
Q_UNUSED(priv);
Q_UNUSED(type);
QColormap::initialize();
qt_init_tooltip_palette();
QApplicationPrivate::initializeWidgetFontHash();
}
void qt_init_tooltip_palette()
{
#ifndef QT_NO_TOOLTIP