Changeset 846 for trunk/mkspecs/common


Ignore:
Timestamp:
May 5, 2011, 5:36:53 AM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
13 edited
31 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/mkspecs/common/g++.conf

    r2 r846  
    99QMAKE_CFLAGS_WARN_OFF   += -w
    1010QMAKE_CFLAGS_RELEASE    += -O2
     11QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -g
    1112QMAKE_CFLAGS_DEBUG      += -g
    1213QMAKE_CFLAGS_SHLIB      += -fPIC
    … …  
    2324QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
    2425QMAKE_CXXFLAGS_RELEASE  += $$QMAKE_CFLAGS_RELEASE
     26QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
    2527QMAKE_CXXFLAGS_DEBUG    += $$QMAKE_CFLAGS_DEBUG
    2628QMAKE_CXXFLAGS_SHLIB    += $$QMAKE_CFLAGS_SHLIB
    … …  
    4446QMAKE_LFLAGS_THREAD     +=
    4547QMAKE_LFLAGS_NOUNDEF    += -Wl,--no-undefined
    46 QMAKE_RPATH             = -Wl,-rpath,
     48QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
    4749
    4850QMAKE_PCH_OUTPUT_EXT    = .gch

  • trunk/mkspecs/common/linux.conf

    r561 r846  
    1616QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
    1717QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
    18 QMAKE_INCDIR_OPENGL_ES1CL = $$QMAKE_INCDIR_OPENGL
    19 QMAKE_LIBDIR_OPENGL_ES1CL = $$QMAKE_LIBDIR_OPENGL
    2018QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
    2119QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
    … …  
    3432QMAKE_LIBS_OPENGL_QT  = -lGL
    3533QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM
    36 QMAKE_LIBS_OPENGL_ES1CL = -lGLES_CL
    3734QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
    3835QMAKE_LIBS_OPENVG     = -lOpenVG

  • trunk/mkspecs/common/llvm.conf

    r2 r846  
    4141QMAKE_LFLAGS_SONAME     += -Wl,-soname,
    4242QMAKE_LFLAGS_THREAD     +=
    43 QMAKE_RPATH             = -Wl,-rpath,
     43QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
    4444
    4545QMAKE_PCH_OUTPUT_EXT    = .gch

  • trunk/mkspecs/common/mac-g++.conf

    r561 r846  
    1111QMAKE_CFLAGS_WARN_OFF   += -w
    1212QMAKE_CFLAGS_RELEASE    += -O2
     13QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -g  -gdwarf-2
    1314QMAKE_CFLAGS_DEBUG      += -g
    1415QMAKE_CFLAGS_SHLIB      += -fPIC
    … …  
    3435QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
    3536QMAKE_CXXFLAGS_RELEASE  += $$QMAKE_CFLAGS_RELEASE
     37QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
    3638QMAKE_CXXFLAGS_DEBUG    += $$QMAKE_CFLAGS_DEBUG
    3739QMAKE_CXXFLAGS_SHLIB    += $$QMAKE_CFLAGS_SHLIB
    … …  
    5355QMAKE_LFLAGS            += -headerpad_max_install_names
    5456QMAKE_LFLAGS_RELEASE    +=
     57QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO += -g -gdwarf-2
    5558QMAKE_LFLAGS_DEBUG      +=
    5659QMAKE_LFLAGS_APP        +=
    … …  
    6871# -all_load requred to make Objective-C categories work in static builds.
    6972QMAKE_LFLAGS_STATIC_LIB += -all_load
    70 QMAKE_RPATH             +=
     73QMAKE_LFLAGS_RPATH      +=
    7174
    7275QMAKE_PCH_OUTPUT_EXT    = .gch

  • trunk/mkspecs/common/mac-llvm.conf

    r561 r846  
    6666QMAKE_LFLAGS_VERSION    += -current_version$${LITERAL_WHITESPACE}
    6767QMAKE_LFLAGS_COMPAT_VERSION += -compatibility_version$${LITERAL_WHITESPACE}
    68 QMAKE_RPATH             +=
     68QMAKE_LFLAGS_RPATH      +=
    6969
    7070QMAKE_PCH_OUTPUT_EXT    = .gch

  • trunk/mkspecs/common/mac.conf

    r561 r846  
    1515QMAKE_FIX_RPATH         = install_name_tool -id
    1616
    17 QMAKE_RPATH             =
     17QMAKE_LFLAGS_RPATH      =
    1818
    1919QMAKE_LIBS_DYNLOAD      =

  • trunk/mkspecs/common/qws.conf

    r2 r846  
    44
    55MAKEFILE_GENERATOR      = UNIX
     6TARGET_PLATFORM         = unix
    67TEMPLATE                = app
    78CONFIG                 += qt warn_on release incremental link_prl
    … …  
    1415QMAKE_INCDIR_OPENGL     =
    1516QMAKE_LIBDIR_OPENGL     =
     17QMAKE_INCDIR_OPENGL_ES1 =
     18QMAKE_LIBDIR_OPENGL_ES1 =
     19QMAKE_INCDIR_OPENGL_ES2 =
     20QMAKE_LIBDIR_OPENGL_ES2 =
    1621QMAKE_LIBS_X11          =
    1722QMAKE_LIBS_X11SM        =

  • trunk/mkspecs/common/symbian/qplatformdefs.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    8585#include <arpa/inet.h>
    8686
    87 #ifdef QT_LARGEFILE_SUPPORT
    88 #define QT_STATBUF              struct stat64
    89 #define QT_STATBUF4TSTAT        struct stat64
    90 #define QT_STAT                 ::stat64
    91 #define QT_FSTAT                ::fstat64
    92 #define QT_LSTAT                ::lstat64
    93 #define QT_OPEN                 ::open64
    94 #define QT_TRUNCATE             ::truncate64
    95 #define QT_FTRUNCATE            ::ftruncate64
    96 #define QT_LSEEK                ::lseek64
    97 #else
    98 #define QT_STATBUF              struct stat
    99 #define QT_STATBUF4TSTAT        struct stat
    100 #define QT_STAT                 ::stat
    101 #define QT_FSTAT                ::fstat
    102 #define QT_LSTAT                ::lstat
    103 #define QT_OPEN                 ::open
    104 #define QT_TRUNCATE             ::truncate
    105 #define QT_FTRUNCATE            ::ftruncate
    106 #define QT_LSEEK                ::lseek
    107 #endif
     87#define QT_USE_XOPEN_LFS_EXTENSIONS
     88// unset large file as symbian doesn't support it
     89#undef QT_LARGEFILE_SUPPORT
     90#include "../posix/qplatformdefs.h"
    10891
    109 #ifdef QT_LARGEFILE_SUPPORT
    110 #define QT_FOPEN                ::fopen64
    111 #define QT_FSEEK                ::fseeko64
    112 #define QT_FTELL                ::ftello64
    113 #define QT_FGETPOS              ::fgetpos64
    114 #define QT_FSETPOS              ::fsetpos64
    115 #define QT_MMAP                 ::mmap64
    116 #define QT_FPOS_T               fpos64_t
    117 #define QT_OFF_T                off64_t
    118 #else
    119 #define QT_FOPEN                ::fopen
    120 #define QT_FSEEK                ::fseek
    121 #define QT_FTELL                ::ftell
    122 #define QT_FGETPOS              ::fgetpos
    123 #define QT_FSETPOS              ::fsetpos
    124 #define QT_MMAP                 ::mmap
    125 #define QT_FPOS_T               fpos_t
    126 #define QT_OFF_T                long
    127 #endif
     92#undef QT_OPEN_LARGEFILE
     93#undef QT_SOCKLEN_T
    12894
    129 #define QT_STAT_REG             S_IFREG
    130 #define QT_STAT_DIR             S_IFDIR
    131 #define QT_STAT_MASK            S_IFMT
    132 #define QT_STAT_LNK             S_IFLNK
    133 #define QT_SOCKET_CONNECT       ::connect
    134 #define QT_SOCKET_BIND          ::bind
    135 #define QT_FILENO               fileno
    136 #define QT_CLOSE                ::close
    137 #define QT_READ                 ::read
    138 #define QT_WRITE                ::write
    139 #define QT_ACCESS               ::access
    140 #define QT_GETCWD               ::getcwd
    141 #define QT_CHDIR                ::chdir
    142 #define QT_MKDIR                ::mkdir
    143 #define QT_RMDIR                ::rmdir
    144 #define QT_OPEN_LARGEFILE       0
    145 #define QT_OPEN_RDONLY          O_RDONLY
    146 #define QT_OPEN_WRONLY          O_WRONLY
    147 #define QT_OPEN_RDWR            O_RDWR
    148 #define QT_OPEN_CREAT           O_CREAT
    149 #define QT_OPEN_TRUNC           O_TRUNC
    150 #define QT_OPEN_APPEND          O_APPEND
    151 
    152 #define QT_SIGNAL_RETTYPE       void
    153 #define QT_SIGNAL_ARGS          int
    154 #define QT_SIGNAL_IGNORE        SIG_IGN
     95#define QT_OPEN_LARGEFILE       0
    15596
    15697#if (defined(__GLIBC__) && (__GLIBC__ >= 2)) || defined(Q_OS_SYMBIAN)
    157 #define QT_SOCKLEN_T            socklen_t
     98#define QT_SOCKLEN_T            socklen_t
    15899#else
    159 #define QT_SOCKLEN_T            int
     100#define QT_SOCKLEN_T            int
    160101#endif
    161 
    162102
    163103#if defined(__ISO_C_VISIBLE) && (__ISO_C_VISIBLE >= 1999)
    … …  
    166106#endif
    167107
    168 
    169108#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/common/symbian/symbian.conf

    r769 r846  
    11#
    2 # qmake configuration for symbian-*
     2# qmake configuration for all symbian mkspecs
    33#
    44
    55TEMPLATE                = app
    6 CONFIG                  += qt warn_on release incremental
     6CONFIG                  += qt warn_on release incremental link_prl sis_targets run_on_phone
    77QT                      += core gui
    88QMAKE_INCREMENTAL_STYLE = sublib
    99
    1010DEFINES                 += UNICODE QT_KEYPAD_NAVIGATION QT_SOFTKEYS_ENABLED QT_USE_MATH_H_FLOATS
     11
    1112QMAKE_COMPILER_DEFINES  += SYMBIAN
    1213
    … …  
    1415QMAKE_EXT_RES           = _res.o
    1516
    16 QMAKE_CC                = gcc
    1717QMAKE_LEX               = flex
    1818QMAKE_LEXFLAGS          =
    … …  
    2929MMP_OPTION_KEYWORDS = CW ARMCC GCCE
    3030VERSION_FLAGS.ARMCC = ARMCC_4_0
    31 QMAKE_CXX               = g++
    3231QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
    33 QMAKE_CXXFLAGS.CW       =
     32# Symbian build system applies -cwd source on the MWCC command line.
     33# this causes problems with include paths, -cwd include uses the same
     34# rules for include paths as ARMCC
     35# This should really be fixed in raptor, as using CXXFLAGS means we pass
     36# both on the command line and rely on the compiler using the last specified
     37QMAKE_CXXFLAGS.CW       = -cwd include
    3438QMAKE_CXXFLAGS.ARMCC      = --visibility_inlines_hidden
    3539QMAKE_CXXFLAGS.ARMCC_4_0  = --import_all_vtbl
    … …  
    5054QMAKE_INCDIR_QT         = $$[QT_INSTALL_HEADERS]
    5155
    52 QMAKE_RUN_CC            = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src
    53 QMAKE_RUN_CC_IMP        = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
    54 QMAKE_RUN_CXX           = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
    55 QMAKE_RUN_CXX_IMP       = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
    56 
    57 QMAKE_LINK              =
    5856QMAKE_LFLAGS            =
    5957QMAKE_LFLAGS.ARMCC      =
    … …  
    6967
    7068QMAKE_LIBS              = -llibc -llibm -leuser -llibdl
    71 QMAKE_LIBS_CORE         = $$QMAKE_LIBS -llibpthread -lefsrv
    72 QMAKE_LIBS_GUI          = $$QMAKE_LIBS_CORE -lfbscli -lbitgdi -lhal -lgdi -lws32 -lapgrfx -lcone -leikcore -lmediaclientaudio -leikcoctl -leiksrv -lapparc -lcentralrepository
     69QMAKE_LIBS_CORE         = $$QMAKE_LIBS -lefsrv -lhal -lbafl
     70QMAKE_LIBS_GUI          = $$QMAKE_LIBS_CORE -lfbscli -lbitgdi -lgdi -lws32 -lapgrfx -lcone -leikcore -lmediaclientaudio -lapparc -lcentralrepository
    7371QMAKE_LIBS_NETWORK      =
    7472QMAKE_LIBS_EGL          = -llibEGL
    75 QMAKE_LIBS_OPENGL       =
     73QMAKE_LIBS_OPENGL       = -llibGLESv2
     74QMAKE_LIBS_OPENGL_ES1   = -llibGLESv1_CM
     75QMAKE_LIBS_OPENGL_ES2   = -llibGLESv2
     76QMAKE_LIBS_OPENGL_QT     = -llibGLESv2 -lcone -lws32
     77QMAKE_LIBS_OPENGL_ES1_QT = -llibGLESv1_CM -lcone -lws32
     78QMAKE_LIBS_OPENGL_ES2_QT = -llibGLESv2 -lcone -lws32
    7679QMAKE_LIBS_OPENVG       = -llibOpenVG -lfbscli -lbitgdi -lgdi
     80QMAKE_LIBS_THREAD       = -llibpthread
    7781QMAKE_LIBS_COMPAT       =
    78 QMAKE_LIBS_QT_ENTRY     = -llibcrt0.lib
    79 QMAKE_LIBS_S60          = -lavkon
     82QMAKE_LIBS_S60          = -lavkon -leikcoctl
    8083
    8184exists($${EPOCROOT}epoc32/include/platform/sgresource/sgimage.h) {
    … …  
    8790    QMAKE_COPY_DIR       = xcopy /s /q /y /i
    8891    QMAKE_MOVE           = move
    89     QMAKE_DEL_FILE       = del
     92    QMAKE_DEL_FILE       = del 2> NUL
    9093    QMAKE_MKDIR          = mkdir
    9194    QMAKE_DEL_DIR        = rmdir
     95    QMAKE_DEL_TREE       = rmdir /s /q
    9296    QMAKE_CHK_DIR_EXISTS = if not exist
     97
     98    QMAKE_MOC            = $$[QT_INSTALL_BINS]\\moc.exe
     99    QMAKE_UIC            = $$[QT_INSTALL_BINS]\\uic.exe
     100    QMAKE_IDC            = $$[QT_INSTALL_BINS]\\idc.exe
    93101} else {
    94102    QMAKE_COPY           = cp
    … …  
    96104    QMAKE_MOVE           = mv
    97105    QMAKE_DEL_FILE       = rm -f
    98     QMAKE_MKDIR          = mkdir
     106    QMAKE_MKDIR          = mkdir -p
    99107    QMAKE_DEL_DIR        = rmdir
     108    QMAKE_DEL_TREE       = rm -rf
    100109    QMAKE_CHK_DIR_EXISTS = test -d
    101 }
    102 
    103 QMAKE_MOC               = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe
    104 QMAKE_UIC               = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe
    105 QMAKE_IDC               = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe
    106 
    107 QMAKE_IDL               = midl
    108 QMAKE_LIB               = ar -ru
    109 QMAKE_RC                = windres
    110 QMAKE_ZIP               = zip -r -9
    111 
    112 QMAKE_STRIP             = strip
    113 QMAKE_STRIPFLAGS_LIB    += --strip-unneeded
     110
     111    QMAKE_MOC            = $$[QT_INSTALL_BINS]/moc
     112    QMAKE_UIC            = $$[QT_INSTALL_BINS]/uic
     113    QMAKE_IDC            = $$[QT_INSTALL_BINS]/idc
     114}
     115
     116QMAKE_IDL                 = midl
     117QMAKE_LIB                 = ar -ru
     118QMAKE_RC                  = windres
     119QMAKE_ZIP                 = zip -r -9
     120QMAKE_UNZIP               = unzip -o
     121
     122QMAKE_TAR                 = tar -cf
     123QMAKE_GZIP                = gzip -9f
     124
     125QT_ARCH               = symbian
    114126
    115127load(qt_config)
    116 load(platform_paths)
    117 load(add_mmp_rules)
    118 
    119 symbian-abld {
    120 # Versions of abld prior to Symbian^3 have a bug where you cannot remove something from the command line without replacing it
    121 # Rather than figure out which version of abld we're using, we'll replace the command with a macro *that should never be used*
    122     MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA = "OPTION_REPLACE ARMCC --export_all_vtbl -D__QT_NOEFFECTMACRO_DONOTUSE"
    123 } else {
    124     MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA = "OPTION_REPLACE ARMCC --export_all_vtbl // don't use --export_all_vtbl"
    125 }
    126 MMP_RULES += PAGED BYTEPAIRCOMPRESSTARGET
    127 MMP_RULES += $$MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA
    128 SYMBIAN_PLATFORMS = WINSCW GCCE ARMV5 ARMV6
    129 
    130 INCLUDEPATH = \
    131     $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian/stl-off \
    132     $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian \
    133     $${EPOCROOT}epoc32/include \
    134     $$OS_LAYER_LIBC_SYSTEMINCLUDE \
    135     $$INCLUDEPATH
    136 
    137 # Ensure '.' directory is the first in include path.
    138 # RVCT seems to do this automatically, but WINSCW compiler does not, so add it here.
    139 MMP_RULES += "USERINCLUDE ."
     128
     129QMAKE_LIBS_QT_ENTRY     = -lqtmain$${QT_LIBINFIX}.lib
     130QMAKE_LIBS_NO_QT_ENTRY  = -llibcrt0.lib
     131QMAKE_LIBS_NO_QT_ENTRY_GCCE  = -llibcrt0_gcce.lib
     132
     133# List of languages that have a Symbian language code mapping provided in localize_deployment.prf
     134SYMBIAN_SUPPORTED_LANGUAGES = \
     135    af sq am ar hy bn bg my be ca \
     136    hr cs da nl en et fi fr gd ka \
     137    de el gu he hi hu is id ga it \
     138    ja kn kk ko lo lv lt mk ms ml \
     139    mr mo mn nb pl pt pa ro ru sr \
     140    si sk sl so es sw sv tl ta te \
     141    th bo ti tr tk uk ur vi cy zu \
     142    nn eu zh gl fa st en_US fr_BE \
     143    pt_BR en_CA fr_CA el_CY tr_CY \
     144    en_TW en_HK en_CN en_JP en_TH \
     145    sv_FI zh_HK es_419 en_ZA fr_CH \
     146    de_CH it_CH zh_TW
     147
     148# These directories must match what configure uses for QT_INSTALL_PLUGINS and QT_INSTALL_IMPORTS
     149QT_PLUGINS_BASE_DIR = /resource/qt$${QT_LIBINFIX}/plugins
     150QT_IMPORTS_BASE_DIR = /resource/qt$${QT_LIBINFIX}/imports
     151
     152load(symbian/platform_paths)
     153
     154# If environment.prf is provided by platform, load that.
     155# It is used for platform specific variable settings, such as SYMBIAN_VERSION.
     156exists($${EPOCROOT}epoc32/tools/qt/mkspecs/features/environment.prf) {
     157    load($${EPOCROOT}epoc32/tools/qt/mkspecs/features/environment.prf)
     158}
     159
     160# Try to detect SDK version if it wasn't set by environment.prf
     161isEmpty(SYMBIAN_VERSION) {
     162    exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/Symbianv4.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/Symbianv4.sis) {
     163        SYMBIAN_VERSION = Symbian4
     164    } else {
     165        # The Symbian^3 PDK does not necessarily contain the required sis files.
     166        # However, libstdcppv5 first appeared in Symbian^3 (S60 5.2), so check for that too.
     167        exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/release/armv5/lib/libstdcppv5.dso) {
     168            SYMBIAN_VERSION = Symbian3
     169        } else {
     170            exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.1.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.1.sis) {
     171                SYMBIAN_VERSION = Symbian2
     172            } else {
     173                exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.0.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.0.sis) {
     174                    SYMBIAN_VERSION = 9.4
     175                } else {
     176                    exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v3.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v3.2.sis) {
     177                        SYMBIAN_VERSION = 9.3
     178                    } else {
     179                        exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v3.1.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v3.1.sis) {
     180                            SYMBIAN_VERSION = 9.2
     181                        } else {
     182                            SYMBIAN_VERSION = Unknown
     183                        }
     184                    }
     185                }
     186            }
     187        }
     188    }
     189}
     190
     191isEmpty(S60_VERSION) {
     192    contains(SYMBIAN_VERSION, "9\\.2") {
     193        S60_VERSION = 3.1
     194    } else:contains(SYMBIAN_VERSION, "9\\.3") {
     195        S60_VERSION = 3.2
     196    } else:contains(SYMBIAN_VERSION, "9\\.4") {
     197        S60_VERSION = 5.0
     198    } else:contains(SYMBIAN_VERSION, "Symbian2") {
     199        S60_VERSION = 5.1
     200    } else:contains(SYMBIAN_VERSION, "Symbian3") {
     201        S60_VERSION = 5.2
     202    } else {
     203        S60_VERSION = Unknown
     204    }
     205}
    140206
    141207# pkg_depends_webkit, pkg_depends_core, and pkg_platform_dependencies can be removed by developer
    … …  
    144210
    145211default_deployment.pkg_prerules += pkg_depends_webkit pkg_depends_qt pkg_platform_dependencies
    146 
    147 # Supports S60 3.0, 3.1, 3.2 and 5.0 by default
    148 pkg_platform_dependencies = \
    149     "; Default HW/platform dependencies" \
    150     "[0x101F7961],0,0,0,{\"S60ProductID\"}" \
    151     "[0x102032BE],0,0,0,{\"S60ProductID\"}" \
    152     "[0x102752AE],0,0,0,{\"S60ProductID\"}" \
    153     "[0x1028315F],0,0,0,{\"S60ProductID\"}" \
    154     " "
    155 
    156 DEPLOYMENT += default_deployment
    157 
    158 exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/Series60v5.0.sis )|exists($${EPOCROOT}epoc32/data/z/system/install/Series60v5.0.sis) {
    159     S60_VERSION = 5.0
    160 } else {
    161     exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/Series60v3.2.sis )|exists($${EPOCROOT}epoc32/data/z/system/install/Series60v3.2.sis) {
    162         S60_VERSION = 3.2
    163     } else {
    164         S60_VERSION = 3.1
    165         MMP_RULES -= PAGED BYTEPAIRCOMPRESSTARGET
    166     }
    167 }
    168 
    169 QMAKE_CXXFLAGS_FAST_VFP.ARMCC = --fpmode fast
    170 # [TODO] QMAKE_CXXFLAGS_FAST_VFP.GCCE =
    171 
    172 symbian {
    173     armfpu = $$find(MMP_RULES, "ARMFPU")
    174     !isEmpty(armfpu) {
    175         vfpv2 = $$find(MMP_RULES, "vfpv2")
    176         !isEmpty(vfpv2) {
    177             # we will respect fpu setting obtained from configure, but,
    178             # if vfpv2 or softvfp+vfpv2 used we want to force RunFast VFP mode
    179             QMAKE_CXXFLAGS.ARMCC += $${QMAKE_CXXFLAGS_FAST_VFP.ARMCC}
    180             # [TODO] QMAKE_CXXFLAGS.GCCE += $${QMAKE_CXXFLAGS_FAST_VFP.GCCE}
     212DEPLOYMENT += default_deployment default_bin_deployment default_resource_deployment default_reg_deployment
     213
     214defineReplace(symbianRemoveSpecialCharacters) {
     215    # Produce identical string to what SymbianCommonGenerator::removeSpecialCharacters
     216
     217    fixedStr = $$1
     218
     219    fixedStr = $$replace(fixedStr, /,_)
     220    fixedStr = $$replace(fixedStr, \\\\,_)
     221    fixedStr = $$replace(fixedStr, " ",_)
     222    fixedStr = $$replace(fixedStr, :,_)
     223
     224    return ($$fixedStr)
     225}
     226
     227# Determines translations that are Symbian supported
     228defineTest(matchSymbianLanguages) {
     229    SYMBIAN_MATCHED_LANGUAGES =
     230    SYMBIAN_MATCHED_TRANSLATIONS =
     231
     232    # Cannot parse .ts file for language here, so detect it from filename.
     233    # Allow two and three character language and country codes.
     234    for(translation, TRANSLATIONS) {
     235        language = $$replace(translation, "^(.*/)?[^/]+_(([^_]{2,3}_)?[^_]{2,3})\\.ts$", \\2)
     236        contains(SYMBIAN_SUPPORTED_LANGUAGES, $$language) {
     237            SYMBIAN_MATCHED_LANGUAGES += $$language
     238            SYMBIAN_MATCHED_TRANSLATIONS += $$translation
    181239        }
    182240    }
    183 }
     241
     242    isEmpty(SYMBIAN_MATCHED_LANGUAGES): SYMBIAN_MATCHED_LANGUAGES = en
     243
     244    export(SYMBIAN_MATCHED_LANGUAGES)
     245    export(SYMBIAN_MATCHED_TRANSLATIONS)
     246}
     247
     248# Symbian pkg files that define multiple languages require a language specific string to be
     249# defined for various items, even though the string often needs to be same for all languages.
     250# This replacement method will generate correct string for such cases based on TRANSLATIONS
     251# variable.
     252defineReplace(addLanguageDependentPkgItem) {
     253    localize_deployment:!isEmpty(TRANSLATIONS):isEmpty(SYMBIAN_MATCHED_LANGUAGES) {
     254        matchSymbianLanguages()
     255    }
     256
     257    pkgItem = $$eval($$1)
     258    pkgLanguageList =
     259
     260    for(dummyItem, SYMBIAN_MATCHED_LANGUAGES) {
     261        pkgLanguageList += "\"$$pkgItem\""
     262    }
     263
     264    isEmpty(pkgLanguageList): pkgLanguageList = "\"$$pkgItem\""
     265
     266    return($$join(pkgLanguageList,",",,))
     267}

  • trunk/mkspecs/common/unix.conf

    r2 r846  
    1010QMAKE_YACC_HEADER       = $base.tab.h
    1111QMAKE_YACC_SOURCE       = $base.tab.c
     12QMAKE_PREFIX_SHLIB      = lib
     13QMAKE_PREFIX_STATICLIB  = lib
     14QMAKE_EXTENSION_STATICLIB = a

  • trunk/mkspecs/common/wince/qmake.conf

    r561 r846  
    6767QMAKE_LIBS_EGL          = libEGL.lib
    6868QMAKE_LIBS_OPENGL_ES1 = libGLES_CM.lib
    69 QMAKE_LIBS_OPENGL_ES1CL = libGLES_CL.lib
    7069QMAKE_LIBS_OPENGL_ES2 = libGLESv2.lib
    7170
    7271QMAKE_LIBS_QT_ENTRY     = -lqtmain
    7372
    74 QMAKE_MOC               = $$[QT_INSTALL_BINS]\moc.exe
    75 QMAKE_UIC               = $$[QT_INSTALL_BINS]\uic.exe
    76 QMAKE_IDC               = $$[QT_INSTALL_BINS]\idc.exe
     73QMAKE_MOC               = $$[QT_INSTALL_BINS]\\moc.exe
     74QMAKE_UIC               = $$[QT_INSTALL_BINS]\\uic.exe
     75QMAKE_IDC               = $$[QT_INSTALL_BINS]\\idc.exe
    7776
    7877QMAKE_IDL               = midl

  • trunk/mkspecs/common/wince/qplatformdefs.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
Note: See TracChangeset for help on using the changeset viewer.