1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup: Rename CFG_ATOMIC64 to CFG_STD_ATOMIC64.

Browse Source 
This brings the feature name in line with the name
of the define.

Change-Id: Ib56c9c25ce83c396e5085d69efd3fe953c1aadd0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Lars Knoll 2016-03-15 09:46:32 +01:00
parent 4f8ac09a4f
commit f212af6c9a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@ -662,7 +662,7 @@ CFG_SYSTEM_PROXIES=no
CFG_ANDROID_STYLE_ASSETS=yes CFG_ANDROID_STYLE_ASSETS=yes
CFG_GSTREAMER=auto CFG_GSTREAMER=auto
CFG_GSTREAMER_VERSION="" CFG_GSTREAMER_VERSION=""
CFG_ATOMIC64=auto CFG_STD_ATOMIC64=auto
# Target architecture # Target architecture
CFG_ARCH= CFG_ARCH=
@ -4433,11 +4433,11 @@ fi
# Detect whether 64-bit std::atomic works -- some 32-bit platforms require extra library support # Detect whether 64-bit std::atomic works -- some 32-bit platforms require extra library support
if compileTest common/atomic64 "64-bit std::atomic"; then if compileTest common/atomic64 "64-bit std::atomic"; then
CFG_ATOMIC64=yes CFG_STD_ATOMIC64=yes
elif compileTest common/atomic64 "64-bit std::atomic in -latomic" -latomic; then elif compileTest common/atomic64 "64-bit std::atomic in -latomic" -latomic; then
CFG_ATOMIC64=libatomic CFG_STD_ATOMIC64=libatomic
else else
CFG_ATOMIC64=no CFG_STD_ATOMIC64=no
fi fi
# detect sse2 support # detect sse2 support
@ -6220,7 +6220,7 @@ if [ "$CFG_STDCXX" != "c++11" ]; then
fi fi
fi fi
if [ "$CFG_ATOMIC64" = "libatomic" ]; then if [ "$CFG_STD_ATOMIC64" = "libatomic" ]; then
QMAKE_CONFIG="$QMAKE_CONFIG atomic64-libatomic" QMAKE_CONFIG="$QMAKE_CONFIG atomic64-libatomic"
fi fi
@ -6662,7 +6662,7 @@ if [ "$CFG_FRAMEWORK" = "yes" ]; then
echo "#define QT_MAC_FRAMEWORK_BUILD" echo "#define QT_MAC_FRAMEWORK_BUILD"
fi fi
if [ "$CFG_ATOMIC64" = "no" ]; then if [ "$CFG_STD_ATOMIC64" = "no" ]; then
echo "#define QT_NO_STD_ATOMIC64" echo "#define QT_NO_STD_ATOMIC64"
fi fi