AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Q_INIT_RESOURCE_EXTERN

Browse Source 
It's not providing any convenience over using Q_INIT_RESOURCE, which does
its own extern, were never documented, and was added back in 2010 without
any commit message justifying its existence.

Change-Id: I1ca9a042d3f4fca34007d28b140661c50064f11b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Tor Arne Vestbø 2013-11-04 10:54:57 +01:00 committed by The Qt Project
parent 2bb6fbbd0f
commit 1b58d9acc4
3 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/global/qglobal.h
View File

@ -326,9 +326,6 @@ typedef double qreal;
# define Q_AUTOTEST_EXPORT # define Q_AUTOTEST_EXPORT
#endif #endif
#define Q_INIT_RESOURCE_EXTERN(name) \
extern int QT_MANGLE_NAMESPACE(qInitResources_ ## name) ();
#define Q_INIT_RESOURCE(name) \ #define Q_INIT_RESOURCE(name) \
do { extern int QT_MANGLE_NAMESPACE(qInitResources_ ## name) (); \ do { extern int QT_MANGLE_NAMESPACE(qInitResources_ ## name) (); \
QT_MANGLE_NAMESPACE(qInitResources_ ## name) (); } while (0) QT_MANGLE_NAMESPACE(qInitResources_ ## name) (); } while (0)

1
src/plugins/platforms/cocoa/qcocoaintegration.mm
View File

@ -63,7 +63,6 @@
static void initResources() static void initResources()
{ {
Q_INIT_RESOURCE_EXTERN(qcocoaresources)
Q_INIT_RESOURCE(qcocoaresources); Q_INIT_RESOURCE(qcocoaresources);
} }

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

@ -111,13 +111,10 @@ extern bool qt_wince_is_pocket_pc(); //qguifunctions_wince.cpp
static void initResources() static void initResources()
{ {
#if defined(Q_OS_WINCE) #if defined(Q_OS_WINCE)
Q_INIT_RESOURCE_EXTERN(qstyle_wince)
Q_INIT_RESOURCE(qstyle_wince); Q_INIT_RESOURCE(qstyle_wince);
#else #else
Q_INIT_RESOURCE_EXTERN(qstyle)
Q_INIT_RESOURCE(qstyle); Q_INIT_RESOURCE(qstyle);
#endif #endif
Q_INIT_RESOURCE_EXTERN(qmessagebox)
Q_INIT_RESOURCE(qmessagebox); Q_INIT_RESOURCE(qmessagebox);
} }