diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-07-15 11:29:16 +0200 |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-07-15 11:35:21 +0200 |
| commit | cd4c5a65b9d91fd84408205c3d20554122037730 (patch) | |
| tree | 3495b44cf34e129c3156224fb2353949221203ee /mkspecs | |
| parent | fde7966c1b6122ed904d30e1f6e83eb8cd3a80b2 (diff) | |
| download | qt4-tools-cd4c5a65b9d91fd84408205c3d20554122037730.tar.gz | |
Make S60 integration optional.
This is more a cleanup of the usage of Q_WS_S60 vs. Q_OS_SYMBIAN than
anything else. One of the side effects of this work was that it was
relatively little work to get QtGui compiling when Q_WS_S60 is not
defined.
Based on this we introduce two new configure options that control S60
integration. Currently the -no-s60 option will not work entirely
because the 's60main' module has not yet been refactored and still has
a dependancy on the S60 libraries.
Reviewed-by: axis <qt-info@nokia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 436f1344c6..4f3e1d267a 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -62,18 +62,16 @@ QMAKE_LFLAGS_DLL = -shared QMAKE_LINK_OBJECT_MAX = 10 QMAKE_LINK_OBJECT_SCRIPT= object_script -QMAKE_DESKTOPSERVICES_LIBS = -lsendas2 -lplatformenv -lcommonui -letext -lapmime -QMAKE_STATUSPANE_LIBS = -lavkon -leikcoctl - QMAKE_LIBS = -llibc -llibm -leuser -llibdl QMAKE_LIBS_CORE = $$QMAKE_LIBS -llibpthread -lefsrv -QMAKE_LIBS_GUI = $$QMAKE_LIBS_CORE -lfbscli -lbitgdi -lhal -lgdi -lws32 -lapgrfx -lcone -leikcore $$QMAKE_DESKTOPSERVICES_LIBS $$QMAKE_STATUSPANE_LIBS -lmediaclientaudio +QMAKE_LIBS_GUI = $$QMAKE_LIBS_CORE -lfbscli -lbitgdi -lhal -lgdi -lws32 -lapgrfx -lcone -leikcore -lmediaclientaudio QMAKE_LIBS_NETWORK = QMAKE_LIBS_EGL = -llibEGL QMAKE_LIBS_OPENGL = QMAKE_LIBS_OPENVG = -llibOpenVG QMAKE_LIBS_COMPAT = QMAKE_LIBS_QT_ENTRY = -llibcrt0.lib +QMAKE_LIBS_S60 = -lavkon -leikcoctl !isEmpty(QMAKE_SH) { QMAKE_COPY = cp |