From 879409fd0ffa2466dbd9f7274a4417b34ed18360 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 16 Dec 2015 14:50:35 +0100 Subject: Use Q_CONSTRUCTOR_FUNCTION instead of doing the same manually Use the macro we have that does exactly what we want without the boiler plate code. Change-Id: I25c67a71f83f91f50128c8a54033ee53ad28e88a Reviewed-by: Erik Verbruggen --- src/gui/image/qimage_conversions.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/gui/image') diff --git a/src/gui/image/qimage_conversions.cpp b/src/gui/image/qimage_conversions.cpp index cbdcf49da7..cc79e73534 100644 --- a/src/gui/image/qimage_conversions.cpp +++ b/src/gui/image/qimage_conversions.cpp @@ -2967,15 +2967,6 @@ static void qInitImageConversions() #endif } -class QImageConversionsInitializer { -public: - QImageConversionsInitializer() - { - qInitImageConversions(); - } -}; - -// Ensure initialization if this object file is linked. -static QImageConversionsInitializer qImageConversionsInitializer; +Q_CONSTRUCTOR_FUNCTION(qInitImageConversions); QT_END_NAMESPACE -- cgit v1.2.3