diff options
| author | axis <qt-info@nokia.com> | 2010-01-26 12:43:24 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-01-26 12:45:38 (GMT) |
| commit | d64407cf376c5723663ebe81f156a3da98d7df24 (patch) | |
| tree | be118deb9c8abd249f8bb3f752064474cc93640b | |
| parent | aaa0259441dffeae230d1cd0017fc21c0d17af5b (diff) | |
| download | Qt-d64407cf376c5723663ebe81f156a3da98d7df24.zip Qt-d64407cf376c5723663ebe81f156a3da98d7df24.tar.gz Qt-d64407cf376c5723663ebe81f156a3da98d7df24.tar.bz2 | |
Switched to using the QMAKE_LIBS_THREAD variable for thread libs.
| -rw-r--r-- | doc/src/development/qmake-manual.qdoc | 2 | ||||
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 3 | ||||
| -rw-r--r-- | mkspecs/features/symbian/thread.prf | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc index d7aa0db..0172cf2 100644 --- a/doc/src/development/qmake-manual.qdoc +++ b/doc/src/development/qmake-manual.qdoc @@ -2582,7 +2582,7 @@ For example: \section1 QMAKE_LIBS_THREAD - \e {This is used on Unix platforms only.} + \e {This is used on Unix and Symbian platforms only.} This variable contains all libraries that need to be linked against when building a multi-threaded application. The diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index c05bd3d..beea4f0 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -56,12 +56,13 @@ QMAKE_LINK_OBJECT_MAX = QMAKE_LINK_OBJECT_SCRIPT= QMAKE_LIBS = -llibc -llibm -leuser -llibdl -QMAKE_LIBS_CORE = $$QMAKE_LIBS -llibpthread -lefsrv +QMAKE_LIBS_CORE = $$QMAKE_LIBS -lefsrv QMAKE_LIBS_GUI = $$QMAKE_LIBS_CORE -lfbscli -lbitgdi -lhal -lgdi -lws32 -lapgrfx -lcone -leikcore -lmediaclientaudio -leikcoctl -leiksrv -lapparc QMAKE_LIBS_NETWORK = QMAKE_LIBS_EGL = -llibEGL QMAKE_LIBS_OPENGL = QMAKE_LIBS_OPENVG = -llibOpenVG -lgraphicsresource +QMAKE_LIBS_THREAD = -llibpthread QMAKE_LIBS_COMPAT = QMAKE_LIBS_QT_ENTRY = -llibcrt0.lib QMAKE_LIBS_S60 = -lavkon diff --git a/mkspecs/features/symbian/thread.prf b/mkspecs/features/symbian/thread.prf new file mode 100644 index 0000000..885438a --- /dev/null +++ b/mkspecs/features/symbian/thread.prf @@ -0,0 +1,2 @@ +# Symbian behaves like POSIX when it comes to threads. +include(../unix/thread.prf) |