diff options
| author | Liang Qi <liang.qi@nokia.com> | 2010-10-26 13:40:04 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2010-10-26 13:40:04 (GMT) |
| commit | dbf03a71487107999d58972a3e18244e9b8139c8 (patch) | |
| tree | f6c39c5a638f2fffc79393e2ac392aa4e222af33 /src/corelib/global | |
| parent | 2d071521228a6bc9ef423cbdbbd8560d28208790 (diff) | |
| parent | f12bb81ff7dc88861b68fa5f218c1e5d0767257b (diff) | |
| download | Qt-dbf03a71487107999d58972a3e18244e9b8139c8.zip Qt-dbf03a71487107999d58972a3e18244e9b8139c8.tar.gz Qt-dbf03a71487107999d58972a3e18244e9b8139c8.tar.bz2 | |
Merge branch 'macMakefileBuildSupport' into master.
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 4800716..ad386a8 100644 --- a/src/corelib/global/global.pri +++ b/src/corelib/global/global.pri @@ -19,7 +19,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 b983132..547ad8d 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -284,7 +284,7 @@ namespace QT_NAMESPACE {} # endif #endif -#if defined(Q_OS_MAC64) && !defined(QT_MAC_USE_COCOA) && !defined(QT_BUILD_QMAKE) +#if defined(Q_OS_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 |