diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-27 07:40:38 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-27 07:40:38 (GMT) |
| commit | e4feb707118947feea8568a82d57a8db6ae59410 (patch) | |
| tree | ecf77b7d677f174b59e1c5110dd7aebee877f02d /src/corelib/global | |
| parent | 85f3f3ac74a2e7fe6a0874a46f9358a15f0dab34 (diff) | |
| parent | 2925995de32f76a72fcdd7d577e609a68a517fa1 (diff) | |
| download | Qt-e4feb707118947feea8568a82d57a8db6ae59410.zip Qt-e4feb707118947feea8568a82d57a8db6ae59410.tar.gz Qt-e4feb707118947feea8568a82d57a8db6ae59410.tar.bz2 | |
Merge remote branch 'qt/master' into lighthouse-master
Conflicts:
src/corelib/global/qglobal.h
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/global.pri | 2 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri index ce43ea3..47b82ef 100644 --- a/src/corelib/global/global.pri +++ b/src/corelib/global/global.pri @@ -23,7 +23,7 @@ INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global # Only used on platforms with CONFIG += precompile_header PRECOMPILED_HEADER = global/qt_pch.h -linux*:!static:!linux-armcc:!linux-gcce { +linux*:!static:!symbian-armcc:!symbian-gcce { QMAKE_LFLAGS += -Wl,-e,qt_core_boilerplate prog=$$quote(if (/program interpreter: (.*)]/) { print $1; }) DEFINES += ELF_INTERPRETER=\\\"$$system(readelf -l /bin/ls | perl -n -e \'$$prog\')\\\" diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 8cd56dd..e71e3b6 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -286,7 +286,7 @@ namespace QT_NAMESPACE {} # endif #endif -#if defined(Q_WS_MAC64) && !defined(QT_MAC_USE_COCOA) && !defined(QT_BUILD_QMAKE) +#if defined(Q_WS_MAC64) && !defined(QT_MAC_USE_COCOA) && !defined(QT_BUILD_QMAKE) && !defined(QT_BOOTSTRAPPED) #error "You are building a 64-bit application, but using a 32-bit version of Qt. Check your build configuration." #endif |