summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@nokia.com>2011-02-11 12:53:34 (GMT)
committerLiang Qi <liang.qi@nokia.com>2011-02-11 12:53:34 (GMT)
commit46de2eb6aacc862b60cb01cc6a0c5e1775265099 (patch)
treea2f92e9d7d24e5dfbea11e80977185f63b141253 /mkspecs
parent1c05257ed6de27c7d9dcc90f23f868035eb738e5 (diff)
downloadQt-46de2eb6aacc862b60cb01cc6a0c5e1775265099.zip
Qt-46de2eb6aacc862b60cb01cc6a0c5e1775265099.tar.gz
Qt-46de2eb6aacc862b60cb01cc6a0c5e1775265099.tar.bz2
Apply the gcce link rules for LIBS_PRIVATE too.
It's needed by building QtOpenGL of Qt for Symbian on Linux and Mac with gcce at least. RevBy: axis
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/symbian/symbian_building.prf6
1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf
index f3b6c25..0d2e053 100644
--- a/mkspecs/features/symbian/symbian_building.prf
+++ b/mkspecs/features/symbian/symbian_building.prf
@@ -51,7 +51,7 @@ defineReplace(processSymbianLibrary) {
}
# This part turn "-llibc" into "libc.dso", and moves -L entries to QMAKE_LIBDIR.
-libsToProcess = LIBS QMAKE_LIBS
+libsToProcess = LIBS LIBS_PRIVATE QMAKE_LIBS
for(libToProcess, libsToProcess) {
qt_libraries = $$split($$libToProcess, " ")
eval($$libToProcess =)
@@ -90,8 +90,8 @@ count(splitVersion, 0) {
} else {
count(splitVersion, 3) {
hexVersion = $$system("sh -c 'printf %02x $$member(splitVersion, 0)'")
- hexPart2 = $$system("sh -c 'printf %02x $$member(splitVersion, 1)'")"
- hexPart2 = $$hexPart2$$system("sh -c 'printf %02x $$member(splitVersion, 2)'")"
+ hexPart2 = $$system("sh -c 'printf %02x $$member(splitVersion, 1)'")
+ hexPart2 = $$hexPart2$$system("sh -c 'printf %02x $$member(splitVersion, 2)'")
decVersion = $$system("sh -c 'printf %1d 0x$$hexVersion'").
hexVersion = $$hexVersion$$hexPart2
decVersion = $$decVersion$$system("sh -c 'printf %d 0x$$hexPart2'")