summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qguiapplication.cpp4
-rw-r--r--src/gui/kernel/qguivariant.cpp6
2 files changed, 4 insertions, 6 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 859295de2b..da981b577b 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -126,8 +126,8 @@ QWindow *QGuiApplicationPrivate::focus_window = 0;
Q_GLOBAL_STATIC(QMutex, applicationFontMutex)
QFont *QGuiApplicationPrivate::app_font = 0;
-extern int qRegisterGuiVariant();
-extern int qUnregisterGuiVariant();
+extern void qRegisterGuiVariant();
+extern void qUnregisterGuiVariant();
extern void qInitDrawhelperAsm();
extern void qInitImageConversions();
diff --git a/src/gui/kernel/qguivariant.cpp b/src/gui/kernel/qguivariant.cpp
index 9198e7f119..3b60f29e83 100644
--- a/src/gui/kernel/qguivariant.cpp
+++ b/src/gui/kernel/qguivariant.cpp
@@ -486,20 +486,18 @@ static const QMetaTypeInterface qVariantGuiHelper[] = {
#undef QT_IMPL_METATYPEINTERFACE_GUI_TYPES
static const QVariant::Handler *qt_guivariant_last_handler = 0;
-int qRegisterGuiVariant()
+void qRegisterGuiVariant()
{
qt_guivariant_last_handler = QVariant::handler;
QVariant::handler = &qt_gui_variant_handler;
qMetaTypeGuiHelper = qVariantGuiHelper;
- return 1;
}
Q_CONSTRUCTOR_FUNCTION(qRegisterGuiVariant)
-int qUnregisterGuiVariant()
+void qUnregisterGuiVariant()
{
QVariant::handler = qt_guivariant_last_handler;
qMetaTypeGuiHelper = 0;
- return 1;
}
Q_DESTRUCTOR_FUNCTION(qUnregisterGuiVariant)