summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJędrzej Nowacki <jedrzej.nowacki@digia.com>2013-01-08 13:07:16 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-10 17:58:13 +0100
commit1327ded7478de7781bcfe57a2eb84dc0c749c91a (patch)
treefd80db36a8651b5add6914e985a1db8def657105 /src
parent0421769e3672a435963c8c7a0b12df134a3f38cd (diff)
Fix QVariant in a static build.
The patch cases registration of QVariant handler for widgets. Task-number: QTBUG-28528 Change-Id: I645e8054bb96db0b92edf5df36f206ec1965ad40 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/widgets/kernel/qapplication.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index ed6262ce93..d558813f8e 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -579,6 +579,7 @@ void QApplicationPrivate::construct()
void qRegisterGuiStateMachine();
void qUnregisterGuiStateMachine();
#endif
+extern void qRegisterWidgetsVariant();
/*!
\fn void QApplicationPrivate::initialize()
@@ -590,6 +591,9 @@ void QApplicationPrivate::initialize()
QWidgetPrivate::mapper = new QWidgetMapper;
QWidgetPrivate::allWidgets = new QWidgetSet;
+ // needed for a static build.
+ qRegisterWidgetsVariant();
+
if (application_type != QApplicationPrivate::Tty)
(void) QApplication::style(); // trigger creation of application style
#ifndef QT_NO_STATEMACHINE