diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-03-28 16:27:09 -0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-23 19:20:19 +0200 |
| commit | 60c9c693791b72394f67d380f66204864b2bba8e (patch) | |
| tree | 915f8842a36b7468e4c26c91a725b9bc3d56f0d3 /src | |
| parent | 83c9ebbd6692cde99ee692e6549c591100f12545 (diff) | |
Move the QT_STRINGIFY macro to the top of qglobal.h
This will allow me to use them in qcompilerdetection.h.
Also, leave them defined.
Change-Id: I73cb39e3cfcc2463d1d47a856e4a64354ebe743c
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qglobal.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 768cf5a022..1cf3838b00 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -62,6 +62,10 @@ #include <QtCore/qconfig.h> #endif +/* These two macros makes it possible to turn the builtin line expander into a + * string literal. */ +#define QT_STRINGIFY2(x) #x +#define QT_STRINGIFY(x) QT_STRINGIFY2(x) #include <QtCore/qsystemdetection.h> #include <QtCore/qcompilerdetection.h> @@ -833,18 +837,8 @@ inline T *q_check_ptr(T *p) { Q_CHECK_PTR(p); return p; } # if defined(Q_OS_SOLARIS) || defined(Q_CC_XLC) # define Q_FUNC_INFO __FILE__ "(line number unavailable)" # else - /* These two macros makes it possible to turn the builtin line expander into a - * string literal. */ -# define QT_STRINGIFY2(x) #x -# define QT_STRINGIFY(x) QT_STRINGIFY2(x) # define Q_FUNC_INFO __FILE__ ":" QT_STRINGIFY(__LINE__) # endif - /* The MIPSpro and RVCT compilers postpones macro expansion, - and therefore macros must be in scope when being used. */ -# if !defined(Q_CC_MIPS) && !defined(Q_CC_RVCT) -# undef QT_STRINGIFY2 -# undef QT_STRINGIFY -# endif #endif |