diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2015-11-03 08:15:44 -0500 |
|---|---|---|
| committer | Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> | 2015-11-04 13:08:02 +0000 |
| commit | 439a7136432113fa3ff6aa6ea8119ab67d251484 (patch) | |
| tree | 29f7b4dfd276162ee4d2ed66cb5afd4c1bb672b4 /src/corelib/global | |
| parent | e304dfb2d3c4ce9b223954ad357aa1e1c919afb3 (diff) | |
Workaround part 2: don't use the version tagging symbols on Android
Commit d020e0781cf8647d87f7088350e40adf4f0cf8fe added a workaround to
the QtCore build due to a qmake bug in handling the extra target on a
Windows host. The workaround removed the tagging symbols from QtCore.
This commit removes the using of those symbols from everywhere else.
Task-number: QTBUG-49208
Change-Id: Idba8c29717f34c70a58fffff14133399f9f0b7f2
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qversiontagging.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qversiontagging.h b/src/corelib/global/qversiontagging.h index 22e6e82a58..4a1c01c89d 100644 --- a/src/corelib/global/qversiontagging.h +++ b/src/corelib/global/qversiontagging.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE #if defined(QT_BUILD_CORE_LIB) || defined(QT_BOOTSTRAPPED) || defined(QT_NO_VERSION_TAGGING) // don't make tags in QtCore, bootstrapped systems or if the user asked not to -#elif defined(Q_CC_GNU) +#elif defined(Q_CC_GNU) && !defined(Q_OS_ANDROID) # if defined(Q_PROCESSOR_X86) && (defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL)) # ifdef __LP64__ # define QT_VERSION_TAG_RELOC(sym) ".quad " QT_STRINGIFY(QT_MANGLE_NAMESPACE(sym)) "@GOTPCREL\n" |