4 files changed, 8 insertions, 15 deletions
diff --git a/src/widgets/animation/qguivariantanimation.cpp b/src/widgets/animation/qguivariantanimation.cpp
index b0b18ed21b..f99b74e2ab 100644
--- a/src/widgets/animation/qguivariantanimation.cpp
+++ b/src/widgets/animation/qguivariantanimation.cpp
@@ -64,18 +64,17 @@ template<> Q_INLINE_TEMPLATE QQuaternion _q_interpolate(const QQuaternion &f,con
     return QQuaternion::slerp(f, t, progress);
 }
 
-static int qRegisterGuiGetInterpolator()
+static void qRegisterGuiGetInterpolator()
 {
     qRegisterAnimationInterpolator<QColor>(_q_interpolateVariant<QColor>);
     qRegisterAnimationInterpolator<QVector2D>(_q_interpolateVariant<QVector2D>);
     qRegisterAnimationInterpolator<QVector3D>(_q_interpolateVariant<QVector3D>);
     qRegisterAnimationInterpolator<QVector4D>(_q_interpolateVariant<QVector4D>);
     qRegisterAnimationInterpolator<QQuaternion>(_q_interpolateVariant<QQuaternion>);
-    return 1;
 }
 Q_CONSTRUCTOR_FUNCTION(qRegisterGuiGetInterpolator)
 
-static int qUnregisterGuiGetInterpolator()
+static void qUnregisterGuiGetInterpolator()
 {
     // casts required by Sun CC 5.5
     qRegisterAnimationInterpolator<QColor>(
@@ -88,8 +87,6 @@ static int qUnregisterGuiGetInterpolator()
         (QVariant (*)(const QVector4D &, const QVector4D &, qreal))0);
     qRegisterAnimationInterpolator<QQuaternion>(
         (QVariant (*)(const QQuaternion &, const QQuaternion &, qreal))0);
-
-    return 1;
 }
 Q_DESTRUCTOR_FUNCTION(qUnregisterGuiGetInterpolator)
 
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index beeb3dad17..472f19a3c1 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -859,8 +859,8 @@ QApplication::QApplication(Display *dpy, int &argc, char **argv,
 #endif // Q_WS_X11
 
 #ifndef QT_NO_STATEMACHINE
-extern int qRegisterGuiStateMachine();
-extern int qUnregisterGuiStateMachine();
+void qRegisterGuiStateMachine();
+void qUnregisterGuiStateMachine();
 #endif
 
 /*!
diff --git a/src/widgets/kernel/qwidgetsvariant.cpp b/src/widgets/kernel/qwidgetsvariant.cpp
index 2e945d28e1..18fec508ea 100644
--- a/src/widgets/kernel/qwidgetsvariant.cpp
+++ b/src/widgets/kernel/qwidgetsvariant.cpp
@@ -151,19 +151,17 @@ static const QMetaTypeInterface qVariantWidgetsHelper[] = {
 
 extern Q_GUI_EXPORT const QVariant::Handler *qt_widgets_variant_handler;
 
-int qRegisterWidgetsVariant()
+void qRegisterWidgetsVariant()
 {
     qt_widgets_variant_handler = &widgets_handler;
     qMetaTypeWidgetsHelper = qVariantWidgetsHelper;
-    return 1;
 }
 Q_CONSTRUCTOR_FUNCTION(qRegisterWidgetsVariant)
 
-int qUnregisterWidgetsVariant()
+void qUnregisterWidgetsVariant()
 {
     qt_widgets_variant_handler = 0;
     qMetaTypeWidgetsHelper = 0;
-    return 1;
 }
 Q_DESTRUCTOR_FUNCTION(qUnregisterWidgetsVariant)
 
diff --git a/src/widgets/statemachine/qguistatemachine.cpp b/src/widgets/statemachine/qguistatemachine.cpp
index 7a498eb77f..f717662ace 100644
--- a/src/widgets/statemachine/qguistatemachine.cpp
+++ b/src/widgets/statemachine/qguistatemachine.cpp
@@ -474,18 +474,16 @@ const QStateMachinePrivate::Handler qt_gui_statemachine_handler = {
 };
 
 static const QStateMachinePrivate::Handler *qt_guistatemachine_last_handler = 0;
-int qRegisterGuiStateMachine()
+void qRegisterGuiStateMachine()
 {
     qt_guistatemachine_last_handler = QStateMachinePrivate::handler;
     QStateMachinePrivate::handler = &qt_gui_statemachine_handler;
-    return 1;
 }
 Q_CONSTRUCTOR_FUNCTION(qRegisterGuiStateMachine)
 
-int qUnregisterGuiStateMachine()
+void qUnregisterGuiStateMachine()
 {
     QStateMachinePrivate::handler = qt_guistatemachine_last_handler;
-    return 1;
 }
 Q_DESTRUCTOR_FUNCTION(qUnregisterGuiStateMachine)