Changeset 846 for trunk/mkspecs


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:
4 deleted
245 edited
70 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/mkspecs/aix-g++-64/qmake.conf

    r2 r846  
    44
    55MAKEFILE_GENERATOR      = UNIX
     6TARGET_PLATFORM         = unix
    67TEMPLATE                = app
    78CONFIG                  += qt warn_on release link_prl

  • trunk/mkspecs/aix-g++-64/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)
    … …  
    4343#define QPLATFORMDEFS_H
    4444
    45 // Get Qt defines/settings
    46 
    47 #include "qglobal.h"
    48 
    49 // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
    50 
    51 #include <unistd.h>
    52 
    53 
    54 // We are hot - unistd.h should have turned on the specific APIs we requested
    55 
    56 
    57 // uncomment if you have problems with <sys/proc.h> because your gcc
    58 // hasn't been built on exactly the same OS version your are using now.
    59 // typedef int crid_t;
    60 // typedef unsigned int class_id_t;
    61 #include <pthread.h>
    62 #include <dirent.h>
    63 #include <fcntl.h>
    64 #include <grp.h>
    65 #include <pwd.h>
    66 #include <signal.h>
    67 #include <dlfcn.h>
    68 #include <strings.h> // AIX X11 headers define FD_ZERO using bzero()
    69 
    70 #include <sys/types.h>
    71 #include <sys/ioctl.h>
    72 #include <sys/ipc.h>
    73 #include <sys/time.h>
    74 #include <sys/select.h>
    75 #include <sys/shm.h>
    76 #include <sys/socket.h>
    77 #include <sys/stat.h>
    78 #include <sys/wait.h>
    79 #include <netinet/in.h>
    80 #ifndef QT_NO_IPV6IFNAME
    81 #include <net/if.h>
    82 #endif
    83 
    84 #ifdef QT_LARGEFILE_SUPPORT
    85 #define QT_STATBUF              struct stat64
    86 #define QT_STATBUF4TSTAT        struct stat64
    87 #define QT_STAT                 ::stat64
    88 #define QT_FSTAT                ::fstat64
    89 #define QT_LSTAT                ::lstat64
    90 #define QT_OPEN                 ::open64
    91 #define QT_TRUNCATE             ::truncate64
    92 #define QT_FTRUNCATE            ::ftruncate64
    93 #define QT_LSEEK                ::lseek64
    94 #else
    95 #define QT_STATBUF              struct stat
    96 #define QT_STATBUF4TSTAT        struct stat
    97 #define QT_STAT                 ::stat
    98 #define QT_FSTAT                ::fstat
    99 #define QT_LSTAT                ::lstat
    100 #define QT_OPEN                ::open
    101 #define QT_TRUNCATE            ::truncate
    102 #define QT_FTRUNCATE           ::ftruncate
    103 #define QT_LSEEK               ::lseek
    104 #endif
    105 
    106 #ifdef QT_LARGEFILE_SUPPORT
    107 #define QT_FOPEN                ::fopen64
    108 #define QT_FSEEK                ::fseeko64
    109 #define QT_FTELL                ::ftello64
    110 #define QT_FGETPOS              ::fgetpos64
    111 #define QT_FSETPOS              ::fsetpos64
    112 #define QT_MMAP                 ::mmap64
    113 #define QT_FPOS_T               fpos64_t
    114 #define QT_OFF_T                off64_t
    115 #else
    116 #define QT_FOPEN                ::fopen
    117 #define QT_FSEEK                ::fseek
    118 #define QT_FTELL                ::ftell
    119 #define QT_FGETPOS              ::fgetpos
    120 #define QT_FSETPOS              ::fsetpos
    121 #define QT_MMAP                 ::mmap
    122 #define QT_FPOS_T               fpos_t
    123 #define QT_OFF_T                long
    124 #endif
    125 
    126 #define QT_STAT_REG             S_IFREG
    127 #define QT_STAT_DIR             S_IFDIR
    128 #define QT_STAT_MASK            S_IFMT
    129 #define QT_STAT_LNK             S_IFLNK
    130 #define QT_SOCKET_CONNECT       ::connect
    131 #define QT_SOCKET_BIND          ::bind
    132 #define QT_FILENO               fileno
    133 #define QT_CLOSE                ::close
    134 #define QT_READ                 ::read
    135 #define QT_WRITE                ::write
    136 #define QT_ACCESS               ::access
    137 #define QT_GETCWD               ::getcwd
    138 #define QT_CHDIR                ::chdir
    139 #define QT_MKDIR                ::mkdir
    140 #define QT_RMDIR                ::rmdir
    141 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    142 #define QT_OPEN_RDONLY          O_RDONLY
    143 #define QT_OPEN_WRONLY          O_WRONLY
    144 #define QT_OPEN_RDWR            O_RDWR
    145 #define QT_OPEN_CREAT           O_CREAT
    146 #define QT_OPEN_TRUNC           O_TRUNC
    147 #define QT_OPEN_APPEND          O_APPEND
    148 
    149 #define QT_SIGNAL_RETTYPE       void
    150 #define QT_SIGNAL_ARGS          int
    151 #define QT_SIGNAL_IGNORE        SIG_IGN
    152 
    153 #ifdef _AIX43
    154 // AIX 4.3 and better
    155 #define QT_SOCKLEN_T            socklen_t
    156 #elif _AIX42
    157 // AIX 4.2
    158 #define QT_SOCKLEN_T            size_t
    159 #else
    160 // AIX 4.1
    161 #define QT_SOCKLEN_T            size_t
    162 // override
    163 #define QT_SOCKOPTLEN_T         int
    164 #endif
    165 
    166 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
    167 // AIX 4.3 and better
    168 #define QT_SNPRINTF             ::snprintf
    169 #define QT_VSNPRINTF            ::vsnprintf
    170 #endif
     45#include "../common/aix/qplatformdefs.h"
    17146
    17247#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/aix-g++/qmake.conf

    r2 r846  
    44
    55MAKEFILE_GENERATOR      = UNIX
     6TARGET_PLATFORM         = unix
    67TEMPLATE                = app
    78CONFIG                  += qt warn_on release link_prl

  • trunk/mkspecs/aix-g++/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)
    … …  
    4343#define QPLATFORMDEFS_H
    4444
    45 // Get Qt defines/settings
    46 
    47 #include "qglobal.h"
    48 
    49 // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
    50 
    51 #include <unistd.h>
    52 
    53 
    54 // We are hot - unistd.h should have turned on the specific APIs we requested
    55 
    56 
    57 // uncomment if you have problems with <sys/proc.h> because your gcc
    58 // hasn't been built on exactly the same OS version your are using now.
    59 // typedef int crid_t;
    60 // typedef unsigned int class_id_t;
    61 #include <pthread.h>
    62 #include <dirent.h>
    63 #include <fcntl.h>
    64 #include <grp.h>
    65 #include <pwd.h>
    66 #include <signal.h>
    67 #include <dlfcn.h>
    68 #include <strings.h> // AIX X11 headers define FD_ZERO using bzero()
    69 
    70 #include <sys/types.h>
    71 #include <sys/ioctl.h>
    72 #include <sys/ipc.h>
    73 #include <sys/time.h>
    74 #include <sys/select.h>
    75 #include <sys/shm.h>
    76 #include <sys/socket.h>
    77 #include <sys/stat.h>
    78 #include <sys/wait.h>
    79 #include <netinet/in.h>
    80 #ifndef QT_NO_IPV6IFNAME
    81 #include <net/if.h>
    82 #endif
    83 
    84 #ifdef QT_LARGEFILE_SUPPORT
    85 #define QT_STATBUF              struct stat64
    86 #define QT_STATBUF4TSTAT        struct stat64
    87 #define QT_STAT                 ::stat64
    88 #define QT_FSTAT                ::fstat64
    89 #define QT_LSTAT                ::lstat64
    90 #define QT_OPEN                 ::open64
    91 #define QT_TRUNCATE             ::truncate64
    92 #define QT_FTRUNCATE            ::ftruncate64
    93 #define QT_LSEEK                ::lseek64
    94 #else
    95 #define QT_STATBUF              struct stat
    96 #define QT_STATBUF4TSTAT        struct stat
    97 #define QT_STAT                 ::stat
    98 #define QT_FSTAT                ::fstat
    99 #define QT_LSTAT                ::lstat
    100 #define QT_OPEN                ::open
    101 #define QT_TRUNCATE            ::truncate
    102 #define QT_FTRUNCATE           ::ftruncate
    103 #define QT_LSEEK               ::lseek
    104 #endif
    105 
    106 #ifdef QT_LARGEFILE_SUPPORT
    107 #define QT_FOPEN                ::fopen64
    108 #define QT_FSEEK                ::fseeko64
    109 #define QT_FTELL                ::ftello64
    110 #define QT_FGETPOS              ::fgetpos64
    111 #define QT_FSETPOS              ::fsetpos64
    112 #define QT_MMAP                 ::mmap64
    113 #define QT_FPOS_T               fpos64_t
    114 #define QT_OFF_T                off64_t
    115 #else
    116 #define QT_FOPEN                ::fopen
    117 #define QT_FSEEK                ::fseek
    118 #define QT_FTELL                ::ftell
    119 #define QT_FGETPOS              ::fgetpos
    120 #define QT_FSETPOS              ::fsetpos
    121 #define QT_MMAP                 ::mmap
    122 #define QT_FPOS_T               fpos_t
    123 #define QT_OFF_T                long
    124 #endif
    125 
    126 #define QT_STAT_REG             S_IFREG
    127 #define QT_STAT_DIR             S_IFDIR
    128 #define QT_STAT_MASK            S_IFMT
    129 #define QT_STAT_LNK             S_IFLNK
    130 #define QT_SOCKET_CONNECT       ::connect
    131 #define QT_SOCKET_BIND          ::bind
    132 #define QT_FILENO               fileno
    133 #define QT_CLOSE                ::close
    134 #define QT_READ                 ::read
    135 #define QT_WRITE                ::write
    136 #define QT_ACCESS               ::access
    137 #define QT_GETCWD               ::getcwd
    138 #define QT_CHDIR                ::chdir
    139 #define QT_MKDIR                ::mkdir
    140 #define QT_RMDIR                ::rmdir
    141 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    142 #define QT_OPEN_RDONLY          O_RDONLY
    143 #define QT_OPEN_WRONLY          O_WRONLY
    144 #define QT_OPEN_RDWR            O_RDWR
    145 #define QT_OPEN_CREAT           O_CREAT
    146 #define QT_OPEN_TRUNC           O_TRUNC
    147 #define QT_OPEN_APPEND          O_APPEND
    148 
    149 #define QT_SIGNAL_RETTYPE       void
    150 #define QT_SIGNAL_ARGS          int
    151 #define QT_SIGNAL_IGNORE        SIG_IGN
    152 
    153 #ifdef _AIX43
    154 // AIX 4.3 and better
    155 #define QT_SOCKLEN_T            socklen_t
    156 #elif _AIX42
    157 // AIX 4.2
    158 #define QT_SOCKLEN_T            size_t
    159 #else
    160 // AIX 4.1
    161 #define QT_SOCKLEN_T            size_t
    162 // override
    163 #define QT_SOCKOPTLEN_T         int
    164 #endif
    165 
    166 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
    167 // AIX 4.3 and better
    168 #define QT_SNPRINTF             ::snprintf
    169 #define QT_VSNPRINTF            ::vsnprintf
    170 #endif
     45#include "../common/aix/qplatformdefs.h"
    17146
    17247#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/aix-xlc-64/qmake.conf

    r769 r846  
    44
    55MAKEFILE_GENERATOR      = UNIX
     6TARGET_PLATFORM         = unix
    67TEMPLATE                = app
    78CONFIG                  += qt warn_on release link_prl

  • trunk/mkspecs/aix-xlc-64/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)
    … …  
    4343#define QPLATFORMDEFS_H
    4444
    45 // Get Qt defines/settings
    46 
    47 #include "qglobal.h"
    48 
    49 // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
    50 
    51 #include <unistd.h>
    52 
    53 
    54 // We are hot - unistd.h should have turned on the specific APIs we requested
    55 
    56 
    57 #include <pthread.h>
    58 #include <dirent.h>
    59 #include <fcntl.h>
    60 #include <grp.h>
    61 #include <pwd.h>
    62 #include <signal.h>
    63 #include <dlfcn.h>
    64 #include <strings.h> // AIX X11 headers define FD_ZERO using bzero()
    65 
    66 #include <sys/types.h>
    67 #include <sys/ioctl.h>
    68 #include <sys/ipc.h>
    69 #include <sys/time.h>
    70 #include <sys/select.h>
    71 #include <sys/shm.h>
    72 #include <sys/socket.h>
    73 #include <sys/stat.h>
    74 #include <sys/wait.h>
    75 #include <netinet/in.h>
    76 #ifndef QT_NO_IPV6IFNAME
    77 #include <net/if.h>
    78 #endif
    79 
    80 #ifdef QT_LARGEFILE_SUPPORT
    81 #define QT_STATBUF              struct stat64
    82 #define QT_STATBUF4TSTAT        struct stat64
    83 #define QT_STAT                 ::stat64
    84 #define QT_FSTAT                ::fstat64
    85 #define QT_LSTAT                ::lstat64
    86 #define QT_OPEN                 ::open64
    87 #define QT_TRUNCATE             ::truncate64
    88 #define QT_FTRUNCATE            ::ftruncate64
    89 #define QT_LSEEK                ::lseek64
    90 #else
    91 #define QT_STATBUF             struct stat
    92 #define QT_STATBUF4TSTAT       struct stat
    93 #define QT_STAT                ::stat
    94 #define QT_FSTAT               ::fstat
    95 #define QT_LSTAT               ::lstat
    96 #define QT_OPEN                ::open
    97 #define QT_TRUNCATE            ::truncate
    98 #define QT_FTRUNCATE           ::ftruncate
    99 #define QT_LSEEK               ::lseek
    100 #endif
    101 
    102 #ifdef QT_LARGEFILE_SUPPORT
    103 #define QT_FOPEN                ::fopen64
    104 #define QT_FSEEK                ::fseeko64
    105 #define QT_FTELL                ::ftello64
    106 #define QT_FGETPOS              ::fgetpos64
    107 #define QT_FSETPOS              ::fsetpos64
    108 #define QT_MMAP                 ::mmap64
    109 #define QT_FPOS_T               fpos64_t
    110 #define QT_OFF_T                off64_t
    111 #else
    112 #define QT_FOPEN                ::fopen
    113 #define QT_FSEEK                ::fseek
    114 #define QT_FTELL                ::ftell
    115 #define QT_FGETPOS              ::fgetpos
    116 #define QT_FSETPOS              ::fsetpos
    117 #define QT_MMAP                 ::mmap
    118 #define QT_FPOS_T               fpos_t
    119 #define QT_OFF_T                long
    120 #endif
    121 
    122 #define QT_STAT_REG             S_IFREG
    123 #define QT_STAT_DIR             S_IFDIR
    124 #define QT_STAT_MASK            S_IFMT
    125 #define QT_STAT_LNK             S_IFLNK
    126 #define QT_SOCKET_CONNECT       ::connect
    127 #define QT_SOCKET_BIND          ::bind
    128 #define QT_FILENO               fileno
    129 #define QT_CLOSE                ::close
    130 #define QT_READ                 ::read
    131 #define QT_WRITE                ::write
    132 #define QT_ACCESS               ::access
    133 #define QT_GETCWD               ::getcwd
    134 #define QT_CHDIR                ::chdir
    135 #define QT_MKDIR                ::mkdir
    136 #define QT_RMDIR                ::rmdir
    137 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    138 #define QT_OPEN_RDONLY          O_RDONLY
    139 #define QT_OPEN_WRONLY          O_WRONLY
    140 #define QT_OPEN_RDWR            O_RDWR
    141 #define QT_OPEN_CREAT           O_CREAT
    142 #define QT_OPEN_TRUNC           O_TRUNC
    143 #define QT_OPEN_APPEND          O_APPEND
    144 
    145 #define QT_SIGNAL_RETTYPE       void
    146 #define QT_SIGNAL_ARGS          int
    147 #define QT_SIGNAL_IGNORE        SIG_IGN
    148 
    149 // Only AIX 4.3 and better support 64-bit
    150 #define QT_SOCKLEN_T            socklen_t
    151 
    152 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
    153 // Only AIX 4.3 and better support 64-bit
    154 #define QT_SNPRINTF             ::snprintf
    155 #define QT_VSNPRINTF            ::vsnprintf
    156 #endif
     45#include "../common/aix/qplatformdefs.h"
    15746
    15847#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/aix-xlc/qmake.conf

    r769 r846  
    44
    55MAKEFILE_GENERATOR      = UNIX
     6TARGET_PLATFORM         = unix
    67TEMPLATE                = app
    78CONFIG                  += qt warn_on release link_prl

  • trunk/mkspecs/aix-xlc/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)
    … …  
    4343#define QPLATFORMDEFS_H
    4444
    45 // Get Qt defines/settings
    46 
    47 #include "qglobal.h"
    48 
    49 // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
    50 
    51 #include <unistd.h>
    52 
    53 
    54 // We are hot - unistd.h should have turned on the specific APIs we requested
    55 
    56 
    57 #include <pthread.h>
    58 #include <dirent.h>
    59 #include <fcntl.h>
    60 #include <grp.h>
    61 #include <pwd.h>
    62 #include <signal.h>
    63 #include <dlfcn.h>
    64 #include <strings.h> // AIX X11 headers define FD_ZERO using bzero()
    65 
    66 #include <sys/types.h>
    67 #include <sys/ioctl.h>
    68 #include <sys/ipc.h>
    69 #include <sys/time.h>
    70 #include <sys/select.h>
    71 #include <sys/shm.h>
    72 #include <sys/socket.h>
    73 #include <sys/stat.h>
    74 #include <sys/wait.h>
    75 #include <netinet/in.h>
    76 #ifndef QT_NO_IPV6IFNAME
    77 #include <net/if.h>
    78 #endif
    79 
    80 #ifdef QT_LARGEFILE_SUPPORT
    81 #define QT_STATBUF              struct stat64
    82 #define QT_STATBUF4TSTAT        struct stat64
    83 #define QT_STAT                 ::stat64
    84 #define QT_FSTAT                ::fstat64
    85 #define QT_LSTAT                ::lstat64
    86 #define QT_OPEN                 ::open64
    87 #define QT_TRUNCATE             ::truncate64
    88 #define QT_FTRUNCATE            ::ftruncate64
    89 #define QT_LSEEK                ::lseek64
    90 #else
    91 #define QT_STATBUF              struct stat
    92 #define QT_STATBUF4TSTAT        struct stat
    93 #define QT_STAT                 ::stat
    94 #define QT_FSTAT                ::fstat
    95 #define QT_LSTAT                ::lstat
    96 #define QT_OPEN                ::open
    97 #define QT_TRUNCATE            ::truncate
    98 #define QT_FTRUNCATE           ::ftruncate
    99 #define QT_LSEEK               ::lseek
    100 #endif
    101 
    102 #ifdef QT_LARGEFILE_SUPPORT
    103 #define QT_FOPEN                ::fopen64
    104 #define QT_FSEEK                ::fseeko64
    105 #define QT_FTELL                ::ftello64
    106 #define QT_FGETPOS              ::fgetpos64
    107 #define QT_FSETPOS              ::fsetpos64
    108 #define QT_MMAP                 ::mmap64
    109 #define QT_FPOS_T               fpos64_t
    110 #define QT_OFF_T                off64_t
    111 #else
    112 #define QT_FOPEN                ::fopen
    113 #define QT_FSEEK                ::fseek
    114 #define QT_FTELL                ::ftell
    115 #define QT_FGETPOS              ::fgetpos
    116 #define QT_FSETPOS              ::fsetpos
    117 #define QT_MMAP                 ::mmap
    118 #define QT_FPOS_T               fpos_t
    119 #define QT_OFF_T                long
    120 #endif
    121 
    122 #define QT_STAT_REG             S_IFREG
    123 #define QT_STAT_DIR             S_IFDIR
    124 #define QT_STAT_MASK            S_IFMT
    125 #define QT_STAT_LNK             S_IFLNK
    126 #define QT_SOCKET_CONNECT       ::connect
    127 #define QT_SOCKET_BIND          ::bind
    128 #define QT_FILENO               fileno
    129 #define QT_CLOSE                ::close
    130 #define QT_READ                 ::read
    131 #define QT_WRITE                ::write
    132 #define QT_ACCESS               ::access
    133 #define QT_GETCWD               ::getcwd
    134 #define QT_CHDIR                ::chdir
    135 #define QT_MKDIR                ::mkdir
    136 #define QT_RMDIR                ::rmdir
    137 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    138 #define QT_OPEN_RDONLY          O_RDONLY
    139 #define QT_OPEN_WRONLY          O_WRONLY
    140 #define QT_OPEN_RDWR            O_RDWR
    141 #define QT_OPEN_CREAT           O_CREAT
    142 #define QT_OPEN_TRUNC           O_TRUNC
    143 #define QT_OPEN_APPEND          O_APPEND
    144 
    145 #define QT_SIGNAL_RETTYPE       void
    146 #define QT_SIGNAL_ARGS          int
    147 #define QT_SIGNAL_IGNORE        SIG_IGN
    148 
    149 #ifdef _AIX43
    150 // AIX 4.3 and better
    151 #define QT_SOCKLEN_T            socklen_t
    152 #elif _AIX42
    153 // AIX 4.2
    154 #define QT_SOCKLEN_T            size_t
    155 #else
    156 // AIX 4.1
    157 #define QT_SOCKLEN_T            size_t
    158 // override
    159 #define QT_SOCKOPTLEN_T         int
    160 #endif
    161 
    162 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500)
    163 // AIX 4.3 and better
    164 #define QT_SNPRINTF             ::snprintf
    165 #define QT_VSNPRINTF            ::vsnprintf
    166 #endif
     45#include "../common/aix/qplatformdefs.h"
    16746
    16847#endif // QPLATFORMDEFS_H

  • 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)

  • trunk/mkspecs/cygwin-g++/qmake.conf

    r2 r846  
    66
    77MAKEFILE_GENERATOR      = UNIX
     8TARGET_PLATFORM         = unix
    89TEMPLATE                = app
    910CONFIG                  += qt warn_on release incremental link_prl
    … …  
    5758QMAKE_LFLAGS_SONAME     = -Wl,-soname,
    5859QMAKE_LFLAGS_THREAD     =
    59 QMAKE_RPATH             = -Wl,-rpath,
     60QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
    6061QMAKE_CYGWIN_SHLIB      = 1
    6162QMAKE_CYGWIN_EXE        = 1

  • trunk/mkspecs/cygwin-g++/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)
    … …  
    8282#include <netinet/in.h>
    8383
     84#define QT_NO_USE_FSEEKO
     85#include "../common/posix/qplatformdefs.h"
    8486
    85 #define QT_STATBUF              struct stat
    86 #define QT_STATBUF4TSTAT        struct stat
    87 #define QT_STAT                 ::stat
    88 #define QT_FSTAT                ::fstat
    89 #define QT_LSTAT                ::lstat
    90 #define QT_OPEN                 ::open
    91 #define QT_STAT_REG             S_IFREG
    92 #define QT_STAT_DIR             S_IFDIR
    93 #define QT_STAT_MASK            S_IFMT
    94 #define QT_STAT_LNK             S_IFLNK
    95 #define QT_SOCKET_CONNECT       ::connect
    96 #define QT_SOCKET_BIND          ::bind
    97 #define QT_FILENO               fileno
    98 #define QT_OPEN                 ::open
    99 #define QT_CLOSE                ::close
    100 #define QT_TRUNCATE             ::truncate
    101 #define QT_FTRUNCATE            ::ftruncate
    102 #define QT_LSEEK                ::lseek
    103 #define QT_READ                 ::read
    104 #define QT_WRITE                ::write
    105 #define QT_ACCESS               ::access
    106 #define QT_GETCWD               ::getcwd
    107 #define QT_CHDIR                ::chdir
    108 #define QT_MKDIR                ::mkdir
    109 #define QT_RMDIR                ::rmdir
    110 #define QT_OPEN_RDONLY          O_RDONLY
    111 #define QT_OPEN_WRONLY          O_WRONLY
    112 #define QT_OPEN_RDWR            O_RDWR
    113 #define QT_OPEN_CREAT           O_CREAT
    114 #define QT_OPEN_TRUNC           O_TRUNC
    115 #define QT_OPEN_APPEND          O_APPEND
    116 #define QT_FOPEN                ::fopen
    117 #define QT_FOPEN                ::fopen
    118 #define QT_FSEEK                ::fseek
    119 #define QT_FTELL                ::ftell
    120 #define QT_FGETPOS              ::fgetpos
    121 #define QT_FSETPOS              ::fsetpos
    122 #define QT_MMAP                 ::mmap
    123 #define QT_FPOS_T               fpos_t
    124 #define QT_OFF_T                long
    125 
    126 #define QT_SIGNAL_RETTYPE       void
    127 #define QT_SIGNAL_ARGS          int
    128 #define QT_SIGNAL_IGNORE        SIG_IGN
    129 
    130 #define QT_SOCKLEN_T            socklen_t
     87#undef QT_OPEN_LARGEFILE
    13188
    13289#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
    … …  
    13592#endif
    13693
    137 
    13894#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/darwin-g++/qmake.conf

    r2 r846  
    66
    77MAKEFILE_GENERATOR      = UNIX
     8TARGET_PLATFORM         = macx
    89TEMPLATE                = app
    910CONFIG                  += qt warn_on release link_prl native_precompiled_headers
    … …  
    6970QMAKE_LFLAGS_COMPAT_VERSION = -compatibility_version$${LITERAL_WHITESPACE}
    7071
    71 QMAKE_RPATH             =
     72QMAKE_LFLAGS_RPATH      =
    7273
    7374QMAKE_LIBS_DYNLOAD      =

  • trunk/mkspecs/darwin-g++/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)
    … …  
    7575#endif
    7676
    77 #define QT_FOPEN                ::fopen
    78 #define QT_FSEEK                ::fseeko
    79 #define QT_FTELL                ::ftello
    80 #define QT_FGETPOS              ::fgetpos
    81 #define QT_FSETPOS              ::fsetpos
    82 #define QT_MMAP                 ::mmap
    83 #define QT_FPOS_T               fpos_t
    84 #define QT_OFF_T                off_t
     77#include "../common/posix/qplatformdefs.h"
    8578
    86 #define QT_STATBUF              struct stat
    87 #define QT_STATBUF4TSTAT        struct stat
    88 #define QT_STAT                 ::stat
    89 #define QT_FSTAT                ::fstat
    90 #define QT_LSTAT                ::lstat
    91 #define QT_STAT_REG             S_IFREG
    92 #define QT_STAT_DIR             S_IFDIR
    93 #define QT_STAT_MASK            S_IFMT
    94 #define QT_STAT_LNK             S_IFLNK
    95 #define QT_SOCKET_CONNECT       ::connect
    96 #define QT_SOCKET_BIND          ::bind
    97 #define QT_FILENO               fileno
    98 #define QT_OPEN                 ::open
    99 #define QT_CLOSE                ::close
    100 #define QT_TRUNCATE             ::truncate
    101 #define QT_FTRUNCATE            ::ftruncate
    102 #define QT_LSEEK                ::lseek
    103 #define QT_READ                 ::read
    104 #define QT_WRITE                ::write
    105 #define QT_ACCESS               ::access
    106 #define QT_GETCWD               ::getcwd
    107 #define QT_CHDIR                ::chdir
    108 #define QT_MKDIR                ::mkdir
    109 #define QT_RMDIR                ::rmdir
     79#undef QT_OPEN_LARGEFILE
    11080#define QT_OPEN_LARGEFILE       0
    111 #define QT_OPEN_RDONLY          O_RDONLY
    112 #define QT_OPEN_WRONLY          O_WRONLY
    113 #define QT_OPEN_RDWR            O_RDWR
    114 #define QT_OPEN_CREAT           O_CREAT
    115 #define QT_OPEN_TRUNC           O_TRUNC
    116 #define QT_OPEN_APPEND          O_APPEND
    117 
    118 #define QT_SIGNAL_RETTYPE       void
    119 #define QT_SIGNAL_ARGS          int
    120 #define QT_SIGNAL_IGNORE        SIG_IGN
    121 
    122 #define QT_SOCKLEN_T            socklen_t
    12381
    12482#define QT_SNPRINTF             ::snprintf

  • trunk/mkspecs/features/dbusadaptors.prf

    r769 r846  
    33for(DBUS_ADAPTOR, $$list($$unique(DBUS_ADAPTORS))) {
    44
    5     !contains(DBUS_ADAPTOR, .*\w\.xml$) {
     5    !contains(DBUS_ADAPTOR, .*\\w\\.xml$) {
    66        warning("Invalid D-BUS adaptor: '$${DBUS_ADAPTOR}', please use 'com.mydomain.myinterface.xml' instead.")
    77        next()

  • trunk/mkspecs/features/dbusinterfaces.prf

    r769 r846  
    55for(DBUS_INTERFACE, $$list($$unique(DBUS_INTERFACES))) {
    66
    7     !contains(DBUS_INTERFACE, .*\w\.xml$) {
     7    !contains(DBUS_INTERFACE, .*\\w\\.xml$) {
    88        warning("Invalid D-BUS interface : '$${DBUS_INTERFACE}', please use 'com.mydomain.myinterface.xml' instead.")
    99        next()

  • trunk/mkspecs/features/default_post.prf

    r769 r846  
     1QT_BREAKPAD_ROOT_PATH = $$(QT_BREAKPAD_ROOT_PATH)
     2!isEmpty(QT_BREAKPAD_ROOT_PATH): \   # quick test first whether requested ...
     3        !staticlib:!static:CONFIG(release, debug|release):contains(TEMPLATE, .*(app|lib)): \   # is it applicable?
     4        !contains(TARGET, .*phony_target.*): \   # monster hack, you don't really see this here, right? ;)
     5        system($$QT_BREAKPAD_ROOT_PATH/qtbreakpadsymbols --breakpad-exists) {    # do we really have it?
     6    CONFIG += breakpad
     7    CONFIG -= no_debug_info separate_debug_info
     8    QMAKE_CFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
     9    QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO
     10    QMAKE_LFLAGS_RELEASE = $$QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO
     11}
     12
    113CONFIG(debug, debug|release):load(debug)
    214else:load(release)
    … …  
    921    CONFIG -= incredibuild_xge
    1022    CONFIG = incredibuild_xge $$CONFIG
     23}
     24
     25breakpad {
     26    !contains(DESTDIR, (/|.:[/\\\\]).*):TARGET_BASEPATH = $${OUT_PWD}/
     27    !isEmpty(DESTDIR):TARGET_BASEPATH = $${TARGET_BASEPATH}$${DESTDIR}/
     28
     29    win32 {
     30        TARGET_BASEPATH ~= s,/,\\,
     31        contains(TEMPLATE, .*lib) {
     32            isEmpty(TARGET_VERSION_EXT):!isEmpty(VERSION) {
     33                TARGET_VERSION_EXT = $$section(VERSION, ., 0, 0)
     34                isEqual(TARGET_VERSION_EXT, 0):unset(TARGET_VERSION_EXT)
     35            }
     36            TARGET_EXT = .dll
     37        } else {
     38            TARGET_EXT = .exe
     39        }
     40
     41        DEBUGFILENAME = $${TARGET_BASEPATH}$${TARGET}$${TARGET_VERSION_EXT}$${TARGET_EXT}
     42        PDBFILENAME = $${TARGET_BASEPATH}$${TARGET}$${TARGET_VERSION_EXT}.pdb
     43        DEBUGFILENAME ~= s,/,\\,
     44        PDBFILENAME ~= s,/,\\,
     45        QMAKE_CLEAN += $$PDBFILENAME  # for the debug case it is hardcoded in qmake
     46    } else {
     47        contains(TEMPLATE, .*lib):LIBPREFIX = lib
     48
     49        macx {
     50            equals(TEMPLATE, lib) {
     51                lib_bundle {
     52                    TARGET_BASEPATH = $${TARGET_BASEPATH}$${TARGET}.framework/$${TARGET}
     53                } else {
     54                    TARGET_BASEPATH = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET}
     55                    !plugin {
     56                        TEMP_VERSION = $$section(VERSION, ., 0, 0)
     57                        isEmpty(TEMP_VERSION):TEMP_VERSION = 1
     58                        TARGET_BASEPATH = $${TARGET_BASEPATH}.$${TEMP_VERSION}
     59                    }
     60                    TARGET_BASEPATH = $${TARGET_BASEPATH}.$${QMAKE_EXTENSION_SHLIB}
     61                }
     62            } else {
     63                app_bundle {
     64                    TARGET_BASEPATH = $${TARGET_BASEPATH}$${TARGET}.app/Contents/MacOS/$${TARGET}
     65                } else {
     66                    TARGET_BASEPATH = $${TARGET_BASEPATH}$${TARGET}
     67                }
     68            }
     69            DEBUGFILENAME = $$TARGET_BASEPATH
     70        } else {
     71            equals(TEMPLATE, lib) {
     72                plugin {
     73                    TARGET_BASEPATH = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET}.so
     74                } else {
     75                    TEMP_VERSION = $$VERSION
     76                    isEmpty(TEMP_VERSION):TEMP_VERSION = 1.0.0
     77                    TARGET_BASEPATH = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET}.so.$${TEMP_VERSION}
     78                }
     79            } else {
     80                TARGET_BASEPATH = $${TARGET_BASEPATH}$${TARGET}
     81            }
     82            DEBUGFILENAME = $$TARGET_BASEPATH
     83        }
     84    }
     85
     86    PROJECTPATH = $$OUT_PWD
     87    win32:PROJECTPATH ~= s,/,\\,
     88
     89    !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n\\t)
     90    QMAKE_POST_LINK += $$quote($${QT_BREAKPAD_ROOT_PATH}$${DIR_SEPARATOR}qtbreakpadsymbols \"$$DEBUGFILENAME\" \"$$PROJECTPATH\")
     91    !isEmpty(QMAKE_STRIP):QMAKE_POST_LINK = $$quote($$QMAKE_POST_LINK$$escape_expand(\\n\\t)$$QMAKE_STRIP \"$$DEBUGFILENAME\")
     92
     93    unset(TARGET_BASEPATH)
     94    unset(SYMBOLFILENAME)
     95    unset(TARGET_EXT)
     96    unset(TARGET_VERSION_EXT)
     97    unset(TEMP_VERSION)
    1198}
    1299
    … …  
    28115    QMAKE_EXTRA_TARGETS += check
    29116}
     117
     118# Add special translation sources for projects that require them.
     119# Note 1: Since lupdate will not parse regular config scopes right, contains checks are used instead.
     120# Note 2: Checking for last value of TEMPLATE is used instead of simple contains check because
     121#         lupdate doesn't respect "-=" variable assignments and therefore always finds "app"
     122#         as the first value of TEMPLATE variable.
     123contains(CONFIG, lupdate_run):contains(CONFIG, localize_deployment) {
     124    equals($$list($$last(TEMPLATE)), app): SOURCES += $$[QT_INSTALL_DATA]/mkspecs/common/symbian/appCaptionForTranslation.cpp
     125    SOURCES += $$[QT_INSTALL_DATA]/mkspecs/common/symbian/packageNameForTranslation.cpp
     126}

  • trunk/mkspecs/features/egl.prf

    r561 r846  
    1212    }
    1313    DEFINES += QT_GLES_EGL
    14 } else:wince*:contains(QT_CONFIG, opengles1cl) {
    15     INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES1CL
    16     LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL_ES1CL
    17     LIBS += $$QMAKE_LFLAGS_EGL
    18     for(p, QMAKE_LIBDIR_OPENGL_ES1CL) {
    19         exists($$p):LIBS_PRIVATE += -L$$p
    20     }
    21     DEFINES += QT_GLES_EGL
    2214} else {
    2315    INCLUDEPATH += $$QMAKE_INCDIR_EGL

  • trunk/mkspecs/features/incredibuild_xge.prf

    r2 r846  
    11contains(TEMPLATE, "vc.*")|contains(TEMPLATE_PREFIX, "vc") {
    2     EOC = \$\$escape_expand(\n\t)
     2    EOC = $$escape_expand(\\n\\t)
    33
    44    # The VCPROJ generator will replace the \r\h with the coded \r\n: &#x0d;&#x0a;
    55    # No other generator understands the \h
    6     win32-msvc.net|win32-msvc2*|wince*msvc*: EOC = \$\$escape_expand(\r\h)
     6    win32-msvc2*|wince*msvc*: EOC = $$escape_expand(\\r\\h)
    77
    88    for(xge, INCREDIBUILD_XGE) {
    9         eval($${xge}.commands = Rem IncrediBuild_AllowRemote $$EOC Rem IncrediBuild_OutputFile $$replace($${xge}.output,/,\\) $$EOC $$eval($${xge}.commands))
     9        $${xge}.commands = Rem IncrediBuild_AllowRemote $$EOC Rem IncrediBuild_OutputFile $$replace($${xge}.output,/,\\) $$EOC $$eval($${xge}.commands)
    1010    }
    1111}

  • trunk/mkspecs/features/lex.prf

    r2 r846  
    1515    !yacc_no_name_mangle:QMAKE_LEXEXTRAFLAGS += $$QMAKE_LEXFLAGS_MANGLE
    1616
    17     lex.commands = $$QMAKE_LEX $$QMAKE_LEXEXTRAFLAGS ${QMAKE_FILE_IN}$$escape_expand(\n\t) \
    18                    $$QMAKE_DEL_FILE $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_lex$${first(QMAKE_EXT_CPP)}$$escape_expand(\n\t) \
    19                    $$QMAKE_MOVE lex.${QMAKE_FILE_BASE}.c $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_lex$${first(QMAKE_EXT_CPP)}$$escape_expand(\n\t)
     17    lex.commands = $$QMAKE_LEX $$QMAKE_LEXEXTRAFLAGS ${QMAKE_FILE_IN}$$escape_expand(\\n\\t) \
     18                   $$QMAKE_DEL_FILE $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_lex$${first(QMAKE_EXT_CPP)}$$escape_expand(\\n\\t) \
     19                   $$QMAKE_MOVE lex.${QMAKE_FILE_BASE}.c $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_lex$${first(QMAKE_EXT_CPP)}$$escape_expand(\\n\\t)
    2020    lex.output = $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_lex$${first(QMAKE_EXT_CPP)}
    2121

  • trunk/mkspecs/features/link_pkgconfig.prf

    r2 r846  
    11# handle pkg-config files
     2isEmpty(PKG_CONFIG):PKG_CONFIG = pkg-config
    23for(PKGCONFIG_LIB, $$list($$unique(PKGCONFIG))) {
    3     QMAKE_CXXFLAGS += $$system(pkg-config --cflags $$PKGCONFIG_LIB)
    4     QMAKE_CFLAGS += $$system(pkg-config --cflags $$PKGCONFIG_LIB)
    5     LIBS += $$system(pkg-config --libs $$PKGCONFIG_LIB)
     4    QMAKE_CXXFLAGS += $$system($$PKG_CONFIG --cflags $$PKGCONFIG_LIB)
     5    QMAKE_CFLAGS += $$system($$PKG_CONFIG --cflags $$PKGCONFIG_LIB)
     6    LIBS += $$system($$PKG_CONFIG --libs $$PKGCONFIG_LIB)
    67}

  • trunk/mkspecs/features/moc.prf

    r769 r846  
    1010INCLUDETEMP=
    1111WIN_INCLUDETEMP=
    12 win32:count($$list($$INCPATH), 40, >) {
     12win32:count($$list($$INCLUDEPATH), 40, >) {
    1313    INCLUDETEMP = $$MOC_DIR/mocinclude.tmp
    1414
    1515    WIN_INCLUDETEMP=$$INCLUDETEMP
    1616
    17     EOC = $$escape_expand(\n\t)
     17    EOC = $$escape_expand(\\n\\t)
    1818
    1919    if(contains(TEMPLATE, "vc.*")|contains(TEMPLATE_PREFIX, "vc")) {
    2020        # the VCPROJ generator will replace the \r\h with the coded \r\n: &#x0d;&#x0a;
    2121        # No other generator understands the \h
    22         if(win32-msvc.net|win32-msvc2*|wince*msvc*): EOC = $$escape_expand(\r\h)
    23         else: EOC = $$escape_expand(\\)$$escape_expand(\n\t)
     22        if(win32-msvc2*|wince*msvc*): EOC = $$escape_expand(\\r\\h)
     23        else: EOC = $$escape_expand(\\\\\\n\\t)
    2424    }
    2525
    2626    unset(INCFILELIST)
    2727    RET =
    28     for(incfile, $$list($$INCPATH)) {
     28    for(incfile, $$list($$INCLUDEPATH)) {
    2929        INCFILELIST = -I$$incfile
    3030        isEmpty(RET): RET += @echo $$INCFILELIST> $$WIN_INCLUDETEMP $$EOC
    … …  
    4040}
    4141
    42 defineReplace(mocCmd) {
     42defineReplace(mocCmdBase) {
    4343    !isEmpty(WIN_INCLUDETEMP) {
    4444        RET =
    … …  
    4646            RET += $$mocinclude.commands
    4747        }
    48         RET += $$QMAKE_MOC $(DEFINES) @$$WIN_INCLUDETEMP $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$1 -o $$2
     48        RET += $$QMAKE_MOC $(DEFINES) @$$WIN_INCLUDETEMP $$join(QMAKE_COMPILER_DEFINES, " -D", -D)
    4949        return($$RET)
    5050    }
    … …  
    5858        else:D = @$($$QMAKE_DEFINES_RSP_VAR)
    5959
    60         return($$QMAKE_MOC $$D $$I $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$1 -o $$2)
     60        return($$QMAKE_MOC $$D $$I $$join(QMAKE_COMPILER_DEFINES, " -D", -D))
    6161    }
    62     return($$QMAKE_MOC $(DEFINES) $(INCPATH) $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$1 -o $$2)
     62    return($$QMAKE_MOC $(DEFINES) $(INCPATH) $$join(QMAKE_COMPILER_DEFINES, " -D", -D))
    6363}
    6464
    … …  
    6666moc_header.CONFIG = moc_verify
    6767moc_header.dependency_type = TYPE_C
    68 moc_header.commands = ${QMAKE_FUNC_mocCmd}
     68moc_header.commands = ${QMAKE_FUNC_mocCmdBase} ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
    6969moc_header.output = $$MOC_DIR/$${QMAKE_H_MOD_MOC}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_CPP)}
    7070moc_header.input = HEADERS
    … …  
    8181moc_source.CONFIG = no_link moc_verify
    8282moc_source.dependency_type = TYPE_C
    83 moc_source.commands = ${QMAKE_FUNC_mocCmd}
     83moc_source.commands = ${QMAKE_FUNC_mocCmdBase} ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
    8484moc_source.output = $$MOC_DIR/$${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}$${QMAKE_EXT_CPP_MOC}
    8585moc_source.input = SOURCES OBJECTIVE_SOURCES

  • trunk/mkspecs/features/qt.prf

    r769 r846  
    3232}
    3333
    34 #handle modules
    35 for(mod,$$list($$files($$[QMAKE_MKSPECS]/modules/qt_*.pri))):include($$mod)
    36 
    3734#handle includes
    3835INCLUDEPATH = $$QMAKE_INCDIR_QT $$INCLUDEPATH #prepending prevents us from picking up "stale" includes
    … …  
    4037
    4138# As order does matter for static libs, we reorder the QT variable here
    42 TMPLIBS = declarative webkit phonon multimedia dbus testlib script scripttools svg qt3support sql xmlpatterns xml egl opengl openvg gui network core
     39TMPLIBS = declarative webkit phonon multimedia dbus testlib script scripttools svg qt3support sql xmlpatterns xml egl opengl openvg gui network core meegographicssystemhelper
    4340for(QTLIB, $$list($$TMPLIBS)) {
    4441   contains(QT, $$QTLIB): QT_ORDERED += $$QTLIB
    … …  
    179176   } else:isEqual(QTLIB, declarative):qlib = QtDeclarative
    180177   else:isEqual(QTLIB, multimedia):qlib = QtMultimedia
     178   else:isEqual(QTLIB, meegographicssystemhelper):qlib = QtMeeGoGraphicsSystemHelper
    181179   else:message("Unknown QT: $$QTLIB"):qlib =
    182180   !isEmpty(qlib) {
    … …  
    210208    !isEmpty(QT_NAMESPACE_MAC_CRC):DEFINES *= QT_NAMESPACE_MAC_CRC=$$QT_NAMESPACE_MAC_CRC
    211209}
     210
     211#SIMD defines:
     212mmx:DEFINES += QT_HAVE_MMX
     2133dnow:DEFINES += QT_HAVE_3DNOW
     214sse:DEFINES += QT_HAVE_SSE QT_HAVE_MMXEXT
     215sse2:DEFINES += QT_HAVE_SSE2
     216sse3:DEFINES += QT_HAVE_SSE3
     217ssse3:DEFINES += QT_HAVE_SSSE3
     218sse4_1:DEFINES += QT_HAVE_SSE4_1
     219sse4_2:DEFINES += QT_HAVE_SSE4_2
     220avx:DEFINES += QT_HAVE_AVX
     221iwmmxt:DEFINES += QT_HAVE_IWMMXT

  • trunk/mkspecs/features/qt_config.prf

    r561 r846  
     1# This file is loaded by the mkspecs, before .qmake.cache has been loaded.
     2# Consequently, we have to do some stunts to get values out of the cache.
     3
    14exists($$_QMAKE_CACHE_):QMAKE_QT_CONFIG = $$fromfile($$_QMAKE_CACHE_, QMAKE_QT_CONFIG)
    25isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) {
    … …  
    912} else {
    1013   debug(1, "Loaded .qconfig.pri from ($$QMAKE_QT_CONFIG)")
     14   for(mod, $$list($$files($$dirname(QMAKE_QT_CONFIG)/modules/qt_*.pri))):include($$mod)
    1115}
    1216

  • trunk/mkspecs/features/qt_functions.prf

    r769 r846  
    5050            # Needed for #include <QtGui> because qs60mainapplication.h includes aknapp.h
    5151            INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE
    52         }
    53         isEqual(LIB_NAME, QtWebKit) {
    54             # Needed for #include <QtXmlPatterns/QtXmlPatterns> because relative inclusion problem in toolchain
     52        } else:isEqual(LIB_NAME, QtWebKit) {
     53            # Needed for because relative inclusion problem in toolchain
    5554            INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtXmlPatterns
    56         }
    57         isEqual(LIB_NAME, QtXmlPatterns) {
     55            INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtNetwork
     56            TARGET.CAPABILITY *= NetworkServices
     57            isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
     58        } else:isEqual(LIB_NAME, QtXmlPatterns) {
    5859            # Needed for #include <QtXmlPatterns/QtXmlPatterns> because relative inclusion problem in toolchain
    5960            INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtNetwork
     61        } else:isEqual(LIB_NAME, QtNetwork) {
     62            TARGET.CAPABILITY *= NetworkServices
     63        } else:isEqual(LIB_NAME, QtDeclarative) {
     64            TARGET.CAPABILITY *= NetworkServices
     65            isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
    6066        }
     67        export(TARGET.EPOCHEAPSIZE)
     68        export(TARGET.CAPABILITY)
    6169    }
    6270    isEmpty(LINKAGE) {

  • trunk/mkspecs/features/static.prf

    r561 r846  
    1212}
    1313
    14 symbian {
    15     # we don't care about exports from static libraries, as they don't end up in DEF files
    16     MMP_RULES -= $$MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA
    17 }
    18 
    1914!static_and_shared:fix_output_dirs:fixExclusiveOutputDirs(static, shared)

  • trunk/mkspecs/features/static_and_shared.prf

    r2 r846  
    1 !contains(TEMPLATE, subdirs):!macx-xcode {
     1!contains(TEMPLATE, subdirs):!macx-xcode:!symbian-abld:!symbian-sbsv2 {
    22    addExclusiveBuilds(static, Static, shared, Shared)
    33}

  • trunk/mkspecs/features/symbian/add_mmp_rules.prf

    r769 r846  
    2424                varVal = $$eval($${var}.default)
    2525            }
    26             !isEmpty(varVal): libBlock += "$$join(varVal,$$escape_expand(\n))"
     26            !isEmpty(varVal): libBlock += "$$join(varVal,$$escape_expand(\\n))"
    2727        }
    2828

  • trunk/mkspecs/features/symbian/application_icon.prf

    r769 r846  
    11load(data_caging_paths)
    22
    3 # If no_icon keyword exist, the S60 UI app is just made hidden. This because S60 app FW
    4 # requires the registration resource file to exist always
    5 contains( CONFIG, no_icon ) {
    6     symbian:RSS_RULES += "hidden = KAppIsHidden;"
    7     CONFIG -= no_icon
    8 } else {
    9 # There is no point in compiling the MIF icon if no_icon CONFIGS is set
    10     !isEmpty(ICON) {
    11 
    12         !count(ICON, 1) {
    13             ICON = $$first(ICON)
    14             warning("Only first icon specified in ICON variable is used: $$ICON")
    15         }
    16 
    17         # Try to produce indentical string to fixedTarget in SymbianMakefileGenerator, replaced chars taken
    18         # from SymbianMakefileGenerator::removeSpecialCharacters.
    19         #
    20         # Note: it is not a major problem even baseTarget is not 100% identical to fixedTarget since qmake
    21         # only uses filename from RSS_RULES.icon_file when referring to icon file name.
    22         baseTarget = $$basename(TARGET)
    23         baseTarget = $$replace(baseTarget, /,_)
    24         baseTarget = $$replace(baseTarget, \\,_)
    25         baseTarget = $$replace(baseTarget, -,_)
    26         baseTarget = $$replace(baseTarget, :,_)
    27         baseTarget = $$replace(baseTarget, \.,_)
    28         baseTarget = $$replace(baseTarget, " ",_)
    29 
    30         # Note: symbian-sbsv2 builds can't utilize extra compiler for mifconv, so ICON handling is done in code
    31         symbian-abld {
    32             #Makefile: requires paths with backslash
    33             ICON = $$replace( ICON, /, \\)
    34 
    35             # Extra compiler rules for mifconv
    36             mifconv.output = ${ZDIR}$$APP_RESOURCE_DIR/$${baseTarget}.mif
    37             # Based on: http://www.forum.nokia.com/document/Cpp_Developers_Library
    38             # svg-t icons should always use /c32 depth
    39             mifconv.commands = mifconv ${QMAKE_FILE_OUT} /c32 ${QMAKE_FILE_IN}
    40             mifconv.input = ICON
    41             mifconv.CONFIG = no_link combine
    42             # target_predeps together with combine seems not to work correctly, lets define it by ourselves
    43             PRE_TARGETDEPS += $$mifconv.output
    44             QMAKE_EXTRA_COMPILERS += mifconv
    45         }
    46         # Rules to use generated MIF file from symbian resources
    47         RSS_RULES.number_of_icons = $$size(ICON)
    48         RSS_RULES.icon_file = $$APP_RESOURCE_DIR/$${baseTarget}.mif
     3contains(CONFIG, no_icon) {
     4    # If no_icon keyword exist, the S60 UI app is just made hidden. This because S60 app FW
     5    # requires the registration resource file to exist always
     6    contains(QT, gui):contains(CONFIG, qt) {
     7        symbian:RSS_RULES += "hidden = KAppIsHidden;"
     8        CONFIG -= no_icon
    499    }
    5010}
    5111
     12!contains(CONFIG, no_icon) {
     13    baseTarget = $$symbianRemoveSpecialCharacters($$basename(TARGET))
     14    contains(baseTarget, "^.*\\..*$") {
     15        CONFIG += no_icon
     16        ICON =
     17        warning("Symbian resources do not support '.' character in TARGET, skipping resource generation.")
     18    } else {
     19        symbian-abld|symbian-sbsv2 {
     20            resourceZDir = $$EPOCROOT$$HW_ZDIR$$APP_RESOURCE_DIR
     21            regZDir = $$EPOCROOT$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR
     22        } else {
     23            contains(DESTDIR, "/.*") {
     24                resourceZDir = $$DESTDIR
     25            } else:isEmpty(DESTDIR) {
     26                resourceZDir = $$OUT_PWD
     27            } else {
     28                resourceZDir = $$OUT_PWD/$$DESTDIR
     29            }
     30            regZDir = $$resourceZDir
     31        }
     32
     33        default_resource_deployment.sources += $$resourceZDir/$${baseTarget}.rsc
     34        default_resource_deployment.path = $$APP_RESOURCE_DIR
     35        default_reg_deployment.sources += $$regZDir/$${baseTarget}_reg.rsc
     36        default_reg_deployment.path = $$REG_RESOURCE_IMPORT_DIR
     37
     38        !isEmpty(ICON) {
     39            !count(ICON, 1) {
     40                ICON = $$first(ICON)
     41                warning("Only first icon specified in ICON variable is used: $$ICON")
     42            }
     43
     44            # Note: symbian-sbsv2 builds can't utilize extra compiler for mifconv, so ICON handling is done in code
     45            !symbian-sbsv2 {
     46                # Absolute path required for shadow builds.
     47                # However, in older Symbian environments abld toolchain can't handle even moderately long
     48                # paths, so don't force absolute there.
     49                !symbian-abld:!contains(ICON, "^(/|\\\\|.:).*"):ICON = $$_PRO_FILE_PWD_/$$ICON
     50
     51                #Makefile: requires paths with backslash
     52                ICON_backslashed = $$ICON
     53
     54                symbian-abld {
     55                    # ${ZDIR} is defined in Makefile
     56                    mifIconZDir = ${ZDIR}$$APP_RESOURCE_DIR
     57                } else {
     58                    mifIconZDir = $$resourceZDir
     59                }
     60
     61                # Extra compiler rules for mifconv
     62                mifconv.target = $$mifIconZDir/$${baseTarget}.mif
     63                contains(QMAKE_HOST.os, "Windows") {
     64                    ICON_backslashed = $$replace(ICON_backslashed, /, \\)
     65                    mifconv.target = $$replace(mifconv.target, /, \\)
     66                }
     67                # Based on: http://www.forum.nokia.com/document/Cpp_Developers_Library
     68                # svg-t icons should always use /c32 depth
     69                mifconv.commands = mifconv $$mifconv.target /c32 $$ICON_backslashed
     70
     71                mifconv.depends = $$ICON
     72                PRE_TARGETDEPS += $$mifconv.target
     73                QMAKE_EXTRA_TARGETS += mifconv
     74                QMAKE_DISTCLEAN += $$mifconv.target
     75            }
     76            # Rules to use generated MIF file from symbian resources
     77            RSS_RULES.number_of_icons = $$size(ICON_backslashed)
     78            RSS_RULES.icon_file = $$APP_RESOURCE_DIR/$${baseTarget}.mif
     79
     80            default_resource_deployment.sources += $$resourceZDir/$${baseTarget}.mif
     81        }
     82    }
     83}
     84
     85

  • trunk/mkspecs/features/symbian/armcc_warnings.prf

    r561 r846  
     1# 68:   integer conversion resulted in a change of sign (sounds useful, but it's
     2#       buggy and is reported even in places where it makes no sense)
    13# 111:  Statement is unreachable
    24# 185:  Dynamic initialization in unreachable code
     5# 187:  use of "=" where "==" may have been intended
    36# 191:  Type qualifier is meaningless on cast type
    47# 368:  class "<class>" defines no constructor to initialize the following: <member>
    58#       (Disabled because there are other ways of assigning besides constructors)
     9# 830:  function "xxx" has no corresponding operator delete (to be called if an
     10#       exception is thrown during initialization of an allocated object) (used a
     11#       lot in 3rd party code)
     12# 997:  function "xxx" is hidden by "yyy" -- virtual function override intended?
     13#       (used all over the place in the Symbian SDK)
    614# 1293: Assignment in condition
    715# 1294: pre-ANSI C style functions declarations (used a lot in 3rd party code)
    816# 2874: <variable> may be used before being set (this one sounds useful, but
    917#       it's output also for class instances, making it useless in practice)
    10 QMAKE_CFLAGS.ARMCC += --diag_suppress 111,185,191,368,1293,1294,2874
     18QMAKE_CFLAGS.ARMCC += --diag_suppress 68,111,185,187,191,368,830,997,1293,1294,2874
     19QMAKE_CXXFLAGS.ARMCC += --diag_suppress 68,111,185,187,191,368,830,997,1293,1294,2874
    1120
    1221# 6780: <origvis> visibility removed from symbol '<symname>' through <impexp>

  • trunk/mkspecs/features/symbian/data_caging_paths.prf

    r769 r846  
    7575}
    7676
    77 isEmpty(QT_PLUGINS_BASE_DIR): QT_PLUGINS_BASE_DIR = /$$RESOURCE_FILES_DIR/qt$${QT_LIBINFIX}/plugins
    7877isEmpty(HW_ZDIR): HW_ZDIR = epoc32/data/z
    7978isEmpty(REG_RESOURCE_DIR): REG_RESOURCE_DIR = /private/10003a3f/apps
    8079isEmpty(REG_RESOURCE_IMPORT_DIR): REG_RESOURCE_IMPORT_DIR = /private/10003a3f/import/apps
     80isEmpty(APP_PRIVATE_DIR_BASE): APP_PRIVATE_DIR_BASE = /private

  • trunk/mkspecs/features/symbian/def_files.prf

    r651 r846  
    44CONFIG -= def_files_disabled
    55
    6 # Firstly, if the MMP_RULES already contain a defBlock variable, don't generate another one
    7 # (this bit is slightly magic, because it depends upon everyone creating their DEFFILE statements
    8 # in a defBlock variable; but otherwise we have to expand MMP_RULES then scan for the DEFFILE keyword)
    9 !contains(MMP_RULES, defBlock) {
    10     # Apps are executables on Symbian, so don't have exports, and therefore don't have DEF files
    11     # Plugins use standard DEF files, which qmake generates, so shouldn't be using these DEFFILE
    12     # statements - they use the qmake generated statements instead
    13     # Static libraries obviously don't have DEF files, as they don't take part in dynamic linkage
    14     !contains(TEMPLATE, app):!contains(CONFIG, plugin):!contains(CONFIG, staticlib): {
    15         !isEmpty(defFilePath) {
    16             defBlock = \
    17             "$${LITERAL_HASH}ifdef WINSCW" \
    18             "DEFFILE $$defFilePath/bwins/$${TARGET}.def" \
    19             "$${LITERAL_HASH}elif defined EABI" \
    20             "DEFFILE $$defFilePath/eabi/$${TARGET}.def" \
    21             "$${LITERAL_HASH}endif"
    22         } else {
    23             # If defFilePath is not defined, then put the folders containing the DEF files at the
    24             # same level as the .pro (and generated MMP) file(s)
    25             defBlock = \
    26             "$${LITERAL_HASH}ifdef WINSCW" \
    27             "DEFFILE ./bwins/$${TARGET}.def" \
    28             "$${LITERAL_HASH}elif defined EABI" \
    29             "DEFFILE ./eabi/$${TARGET}.def" \
    30             "$${LITERAL_HASH}endif"
     6# We need a target name without the INFIX'ed part, since DEF files are not infixed.
     7equals(QMAKE_TARGET_PRODUCT, Qt4)|equals(QMAKE_TARGET_PRODUCT, QTestLib):clean_TARGET = $$replace(TARGET, "$${QT_LIBINFIX}$", "")
     8else:clean_TARGET = $$TARGET
     9
     10symbian-abld|symbian-sbsv2 {
     11    # Firstly, if the MMP_RULES already contain a defBlock variable, don't generate another one
     12    # (this bit is slightly magic, because it depends upon everyone creating their DEFFILE statements
     13    # in a defBlock variable; but otherwise we have to expand MMP_RULES then scan for the DEFFILE keyword)
     14    # Similarly, explicit EXPORTUNFROZEN should block adding defBlock
     15    !contains(MMP_RULES, defBlock):!contains(MMP_RULES, EXPORTUNFROZEN) {
     16        # Apps are executables on Symbian, so don't have exports, and therefore don't have DEF files
     17        # Plugins use standard DEF files, which qmake generates, so shouldn't be using these DEFFILE
     18        # statements - they use the qmake generated statements instead
     19        # Static libraries obviously don't have DEF files, as they don't take part in dynamic linkage
     20        !contains(TEMPLATE, app):!contains(CONFIG, plugin):!contains(CONFIG, staticlib): {
     21            !isEmpty(DEF_FILE) {
     22                defBlock = \
     23                "$${LITERAL_HASH}ifdef WINSCW" \
     24                "DEFFILE $$DEF_FILE/bwins/$${clean_TARGET}.def" \
     25                "$${LITERAL_HASH}elif defined EABI" \
     26                "DEFFILE $$DEF_FILE/eabi/$${clean_TARGET}.def" \
     27                "$${LITERAL_HASH}endif"
     28            } else:!isEmpty(defFilePath) {
     29                defBlock = \
     30                "$${LITERAL_HASH}ifdef WINSCW" \
     31                "DEFFILE $$defFilePath/bwins/$${clean_TARGET}.def" \
     32                "$${LITERAL_HASH}elif defined EABI" \
     33                "DEFFILE $$defFilePath/eabi/$${clean_TARGET}.def" \
     34                "$${LITERAL_HASH}endif"
     35            } else {
     36                # If defFilePath is not defined, then put the folders containing the DEF files at the
     37                # same level as the .pro (and generated MMP) file(s)
     38                defBlock = \
     39                "$${LITERAL_HASH}ifdef WINSCW" \
     40                "DEFFILE ./bwins/$${clean_TARGET}.def" \
     41                "$${LITERAL_HASH}elif defined EABI" \
     42                "DEFFILE ./eabi/$${clean_TARGET}.def" \
     43                "$${LITERAL_HASH}endif"
     44            }
     45            MMP_RULES += defBlock
    3146        }
    32         MMP_RULES += defBlock
    3347    }
     48
     49} else:contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib):!contains(CONFIG, plugin) {
     50    !isEmpty(DEF_FILE) {
     51        defFile = $$DEF_FILE
     52    } else {
     53        defFile = .
     54    }
     55    system("$$QMAKE_CHK_DIR_EXISTS $$_PRO_FILE_PWD_/$$defFile") {
     56        !exists("$$_PRO_FILE_PWD_/$$defFile/eabi") {
     57            system("$$QMAKE_MKDIR $$_PRO_FILE_PWD_/$$defFile/eabi")
     58        }
     59        elf2e32FileToAdd = $$_PRO_FILE_PWD_/$$defFile/eabi/$$basename(clean_TARGET)u.def
     60    } else {
     61        elf2e32FileToAdd = $$_PRO_FILE_PWD_/$$defFile
     62    }
     63    QMAKE_ELF2E32_FLAGS += "--definput=$$elf2e32FileToAdd"
     64
     65    symbianObjdir = $$OBJECTS_DIR
     66    isEmpty(symbianObjdir):symbianObjdir = .
     67
     68    freeze_target.target = freeze
     69    freeze_target.depends = first
     70    # The perl part is to convert to unix line endings and remove comments, which the s60 tools refuse to do.
     71    freeze_target.commands = $$QMAKE_COPY $$symbianObjdir/$${TARGET}.def $$elf2e32FileToAdd
     72    QMAKE_EXTRA_TARGETS += freeze_target
     73} else:contains(TEMPLATE, subdirs) {
     74    freeze_target.target = freeze
     75    freeze_target.CONFIG = recursive
     76    freeze_target.recurse = $$SUBDIRS
     77    QMAKE_EXTRA_TARGETS += freeze_target
     78} else {
     79    freeze_target.target = freeze
     80    freeze_target.commands =
     81    QMAKE_EXTRA_TARGETS += freeze_target
    3482}

  • trunk/mkspecs/features/symbian/def_files_disabled.prf

    r651 r846  
    99        # with EXPORTUNFROZEN enabled, new exports are included in the dll and dso/lib without
    1010        # needing to run abld/sbs freeze
    11         MMP_RULES += EXPORTUNFROZEN
     11        MMP_RULES *= EXPORTUNFROZEN
    1212    }
    1313}

  • trunk/mkspecs/features/symbian/default_post.prf

    r769 r846  
    44    contains(CONFIG, stdbinary) {
    55        QMAKE_LIBS +=
    6     } else:contains(QT, gui):contains(CONFIG,qt) {
    7         S60MAIN_LIBS = -leuser
    8         QMAKE_LIBS += -lqtmain$${QT_LIBINFIX}.lib $$S60MAIN_LIBS
     6    } else:contains(CONFIG,qt) {
     7        QMAKE_LIBS += $$QMAKE_LIBS_QT_ENTRY
    98    } else {
    10         QMAKE_LIBS += $$QMAKE_LIBS_QT_ENTRY
     9        QMAKE_LIBS += $$QMAKE_LIBS_NO_QT_ENTRY
    1110    }
     11
     12    contains(DESTDIR, "/.*") {
     13        default_bin_deployment.sources += $$DESTDIR/$$symbianRemoveSpecialCharacters($$basename(TARGET)).exe
     14    } else:isEmpty(DESTDIR) {
     15        default_bin_deployment.sources += $$OUT_PWD/$$symbianRemoveSpecialCharacters($$basename(TARGET)).exe
     16    } else {
     17        default_bin_deployment.sources += $$OUT_PWD/$$DESTDIR/$$symbianRemoveSpecialCharacters($$basename(TARGET)).exe
     18    }
     19    default_bin_deployment.path += /sys/bin
     20
     21    load(application_icon.prf)
    1222}
    1323contains(TEMPLATE, lib): {
    … …  
    2737}
    2838
    29 contains(TEMPLATE, ".*app"):contains(QT, gui):contains(CONFIG,qt) {
    30     load(application_icon.prf)
     39isEmpty(TARGET.UID3):TARGET.UID3 = $$generate_uid("$${OUT_PWD}/$${TARGET}")
     40isEmpty(TARGET.UID2) {
     41    contains(CONFIG, stdbinary) {
     42        TARGET.UID2 = 0x20004C45
     43    } else {
     44        contains(TEMPLATE, app) {
     45            contains(QT, gui) {
     46                TARGET.UID2 = 0x100039CE
     47            } else {
     48                TARGET.UID2 = 0
     49            }
     50        } else:contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib) {
     51            TARGET.UID2 = 0x1000008d
     52        }
     53    }
    3154}
     55
     56# Supports Symbian^3 and Symbian^4 by default and also S60 3.1, 3.2, and 5.0 if built against any of those.
     57platform_product_id = S60ProductID
     58platform_product_id = $$addLanguageDependentPkgItem(platform_product_id)
     59pkg_platform_dependencies = \
     60    "; Default HW/platform dependencies" \
     61    "[0x20022E6D],0,0,0,{$$platform_product_id}" \
     62    "[0x20032DE7],0,0,0,{$$platform_product_id}"
     63contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
     64    pkg_platform_dependencies += \
     65        "[0x102032BE],0,0,0,{$$platform_product_id}" \
     66        "[0x102752AE],0,0,0,{$$platform_product_id}" \
     67        "[0x1028315F],0,0,0,{$$platform_product_id}"
     68}

  • trunk/mkspecs/features/symbian/moc.prf

    r561 r846  
    11load(moc)
    22
    3 RET = $$find(MOC_DIR, "(/|^)\.[^/]+/?$")
    4 !isEmpty(RET):{
    5     error("Symbian does not support directories starting with a dot. Please set MOC_DIR to a different value in your profile. MOC_DIR: $$MOC_DIR")
     3symbian-abld|symbian-sbsv2 {
     4    RET = $$find(MOC_DIR, "(/|^)\\.[^/]+/?$")
     5    !isEmpty(RET):{
     6        error("Symbian does not support directories starting with a dot. Please set MOC_DIR to a different value in your profile. MOC_DIR: $$MOC_DIR")
     7    }
     8
     9    RET = $$find(RCC_DIR, "(/|^)\\.[^/]+/?$")
     10    !isEmpty(RET):{
     11        error("Symbian does not support directories starting with a dot. Please set RCC_DIR to a different value in your profile. RCC_DIR: $$RCC_DIR")
     12    }
     13
     14    RET = $$find(OBJECTS_DIR, "(/|^)\\.[^/]+/?$")
     15    !isEmpty(RET):{
     16        error("Symbian does not support directories starting with a dot. Please set OBJECTS_DIR to a different value in your profile. OBJECTS_DIR: $$OBJECTS_DIR")
     17    }
    618}
    7 
    8 RET = $$find(RCC_DIR, "(/|^)\.[^/]+/?$")
    9 !isEmpty(RET):{
    10     error("Symbian does not support directories starting with a dot. Please set RCC_DIR to a different value in your profile. RCC_DIR: $$RCC_DIR")
    11 }
    12 
    13 RET = $$find(OBJECTS_DIR, "(/|^)\.[^/]+/?$")
    14 !isEmpty(RET):{
    15     error("Symbian does not support directories starting with a dot. Please set OBJECTS_DIR to a different value in your profile. OBJECTS_DIR: $$OBJECTS_DIR")
    16 }

  • trunk/mkspecs/features/symbian/platform_paths.prf

    r769 r846  
    4646#         INCLUDEPATH += $$OS_LAYER_LIBUTILITY_SYSTEMINCLUDE
    4747#
    48 #
    49 #       
     48#     These paths are primarily meant to be used as is in bld.inf and .mmp
     49#     files, so they do not contain epocroot when using official symbian
     50#     toolchains (symbian-abld or symbian-sbsv2).
     51#     For makefile based mkspecs, epocroot is prepended to all paths for
     52#     convenience.
     53#
     54#     To use paths defined here in other contexts that require epocroot to be
     55#     prepended always, such as exists checks, please use prependEpocroot
     56#     replacement function:
     57#
     58#         exists($$prependEpocroot($$MW_LAYER_PUBLIC_EXPORT_PATH(foobar.h)))
    5059#
    5160# ==============================================================================
    5261
    53 exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
    54    
     62symbian-abld|symbian-sbsv2 {
     63    epocroot_prefix = /
     64} else {
     65    epocroot_prefix = $${EPOCROOT}
     66}
     67
     68symbian-abld|symbian-sbsv2:exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
     69
     70    # Symbian does not provide correct profiles for non-mmp based systems, so
     71    # we only should get in here with abld and sbsv2.
     72
    5573    # Load platform specific paths
    5674    load($${EPOCROOT}epoc32/include/platform_paths.prf)
    … …  
    6785
    6886        defineReplace(APP_LAYER_SDK_EXPORT_PATH) {
    69              return (/epoc32/include/app/$$1)
     87             return ($${epocroot_prefix}epoc32/include/app/$$1)
    7088        }
    7189        defineReplace(APP_LAYER_PUBLIC_EXPORT_PATH) {
    72              return (/epoc32/include/app/$$1)
     90             return ($${epocroot_prefix}epoc32/include/app/$$1)
    7391        }
    7492
    … …  
    7896
    7997        defineReplace(APP_LAYER_DOMAIN_EXPORT_PATH) {
    80              return (/epoc32/include/platform/app/$$1)
     98             return ($${epocroot_prefix}epoc32/include/platform/app/$$1)
    8199        }
    82100        defineReplace(APP_LAYER_PLATFORM_EXPORT_PATH) {
    83              return (/epoc32/include/platform/app/$$1)
     101             return ($${epocroot_prefix}epoc32/include/platform/app/$$1)
    84102        }
    85103
    … …  
    89107
    90108        defineReplace(MW_LAYER_SDK_EXPORT_PATH) {
    91              return (/epoc32/include/mw/$$1)
     109             return ($${epocroot_prefix}epoc32/include/mw/$$1)
    92110        }
    93111        defineReplace(MW_LAYER_PUBLIC_EXPORT_PATH) {
    94              return (/epoc32/include/mw/$$1)
     112             return ($${epocroot_prefix}epoc32/include/mw/$$1)
    95113        }
    96114
    … …  
    100118
    101119        defineReplace(MW_LAYER_DOMAIN_EXPORT_PATH) {
    102              return (/epoc32/include/platform/mw/$$1)
     120             return ($${epocroot_prefix}epoc32/include/platform/mw/$$1)
    103121        }
    104122        defineReplace(MW_LAYER_PLATFORM_EXPORT_PATH) {
    105              return (/epoc32/include/platform/mw/$$1)
     123             return ($${epocroot_prefix}epoc32/include/platform/mw/$$1)
    106124        }
    107125
    … …  
    111129
    112130        defineReplace(OSEXT_LAYER_SDK_EXPORT_PATH) {
    113              return (/epoc32/include/$$1)
     131             return ($${epocroot_prefix}epoc32/include/$$1)
    114132        }
    115133        # WARNING: If the following path changes see the exists() function around line 219
    116134        defineReplace(OS_LAYER_PUBLIC_EXPORT_PATH) {
    117              return (/epoc32/include/$$1)
     135             return ($${epocroot_prefix}epoc32/include/$$1)
    118136        }
    119137
    … …  
    123141
    124142        defineReplace(OSEXT_LAYER_DOMAIN_EXPORT_PATH) {
    125              return (/epoc32/include/platform/$$1)
     143             return ($${epocroot_prefix}epoc32/include/platform/$$1)
    126144        }
    127145        defineReplace(OS_LAYER_PLATFORM_EXPORT_PATH) {
    128              return (/epoc32/include/platform/$$1)
     146             return ($${epocroot_prefix}epoc32/include/platform/$$1)
    129147        }
    130148
    … …  
    153171
    154172        APP_LAYER_SYSTEMINCLUDE = \
    155          /epoc32/include \
    156          /epoc32/include/mw \
    157          /epoc32/include/platform/mw \
    158          /epoc32/include/platform \
    159          /epoc32/include/app \
    160          /epoc32/include/platform/app \
    161          /epoc32/include/platform/loc \
    162          /epoc32/include/platform/mw/loc \
    163          /epoc32/include/platform/app/loc \
    164          /epoc32/include/platform/loc/sc \
    165          /epoc32/include/platform/mw/loc/sc \
    166          /epoc32/include/platform/app/loc/sc
     173         $${epocroot_prefix}epoc32/include \
     174         $${epocroot_prefix}epoc32/include/mw \
     175         $${epocroot_prefix}epoc32/include/platform/mw \
     176         $${epocroot_prefix}epoc32/include/platform \
     177         $${epocroot_prefix}epoc32/include/app \
     178         $${epocroot_prefix}epoc32/include/platform/app \
     179         $${epocroot_prefix}epoc32/include/platform/loc \
     180         $${epocroot_prefix}epoc32/include/platform/mw/loc \
     181         $${epocroot_prefix}epoc32/include/platform/app/loc \
     182         $${epocroot_prefix}epoc32/include/platform/loc/sc \
     183         $${epocroot_prefix}epoc32/include/platform/mw/loc/sc \
     184         $${epocroot_prefix}epoc32/include/platform/app/loc/sc
    167185
    168186        # This define statements defines the include paths, which are intended to be
    … …  
    172190
    173191        MW_LAYER_SYSTEMINCLUDE = \
    174          /epoc32/include \
    175          /epoc32/include/mw \
    176          /epoc32/include/platform/mw \
    177          /epoc32/include/platform \
    178          /epoc32/include/platform/loc \
    179          /epoc32/include/platform/mw/loc \
    180          /epoc32/include/platform/loc/sc \
    181          /epoc32/include/platform/mw/loc/sc
     192         $${epocroot_prefix}epoc32/include \
     193         $${epocroot_prefix}epoc32/include/mw \
     194         $${epocroot_prefix}epoc32/include/platform/mw \
     195         $${epocroot_prefix}epoc32/include/platform \
     196         $${epocroot_prefix}epoc32/include/platform/loc \
     197         $${epocroot_prefix}epoc32/include/platform/mw/loc \
     198         $${epocroot_prefix}epoc32/include/platform/loc/sc \
     199         $${epocroot_prefix}epoc32/include/platform/mw/loc/sc
    182200
    183201        # This define statements defines the include paths, which are intended to be
    … …  
    187205
    188206        OS_LAYER_SYSTEMINCLUDE = \
    189          /epoc32/include \
    190          /epoc32/include/platform \
    191          /epoc32/include/platform/loc \
    192          /epoc32/include/platform/loc/sc
     207         $${epocroot_prefix}epoc32/include \
     208         $${epocroot_prefix}epoc32/include/platform \
     209         $${epocroot_prefix}epoc32/include/platform/loc \
     210         $${epocroot_prefix}epoc32/include/platform/loc/sc
    193211
    194212        # This define statements defines the include paths, which are intended to be
    … …  
    199217
    200218        OS_LAYER_KERNEL_SYSTEMINCLUDE = \
    201          /epoc32/include/platform
     219         $${epocroot_prefix}epoc32/include/platform
    202220
    203221
    … …  
    238256
    239257        defineReplace(APP_LAYER_SDK_EXPORT_PATH) {
    240              return (/epoc32/include/applications/$$1)
     258             return ($${epocroot_prefix}epoc32/include/applications/$$1)
    241259        }
    242260        defineReplace(APP_LAYER_PUBLIC_EXPORT_PATH) {
    243              return (/epoc32/include/applications/$$1)
     261             return ($${epocroot_prefix}epoc32/include/applications/$$1)
    244262        }
    245263
    … …  
    249267
    250268        defineReplace(APP_LAYER_DOMAIN_EXPORT_PATH) {
    251              return (/epoc32/include/domain/applications/$$1)
     269             return ($${epocroot_prefix}epoc32/include/domain/applications/$$1)
    252270        }
    253271        defineReplace(APP_LAYER_PLATFORM_EXPORT_PATH) {
    254              return (/epoc32/include/domain/applications/$$1)
     272             return ($${epocroot_prefix}epoc32/include/domain/applications/$$1)
    255273        }
    256274
    … …  
    260278
    261279        defineReplace(MW_LAYER_SDK_EXPORT_PATH) {
    262              return (/epoc32/include/middleware/$$1)
     280             return ($${epocroot_prefix}epoc32/include/middleware/$$1)
    263281        }
    264282        defineReplace(MW_LAYER_PUBLIC_EXPORT_PATH) {
    265              return (/epoc32/include/middleware/$$1)
     283             return ($${epocroot_prefix}epoc32/include/middleware/$$1)
    266284        }
    267285
    … …  
    271289
    272290        defineReplace(MW_LAYER_DOMAIN_EXPORT_PATH) {
    273              return (/epoc32/include/domain/middleware/$$1)
     291             return ($${epocroot_prefix}epoc32/include/domain/middleware/$$1)
    274292        }
    275293        defineReplace(MW_LAYER_PLATFORM_EXPORT_PATH) {
    276              return (/epoc32/include/domain/middleware/$$1)
     294             return ($${epocroot_prefix}epoc32/include/domain/middleware/$$1)
    277295        }
    278296
    … …  
    282300
    283301        defineReplace(OSEXT_LAYER_SDK_EXPORT_PATH) {
    284              return (/epoc32/include/osextensions/$$1)
     302             return ($${epocroot_prefix}epoc32/include/osextensions/$$1)
    285303        }
    286304        # WARNING: If the following path changes see the exists() function around line 430
    287305        defineReplace(OS_LAYER_PUBLIC_EXPORT_PATH) {
    288              return (/epoc32/include/osextensions/$$1)
     306             return ($${epocroot_prefix}epoc32/include/osextensions/$$1)
    289307        }
    290308
    … …  
    294312
    295313        defineReplace(OSEXT_LAYER_DOMAIN_EXPORT_PATH) {
    296              return (/epoc32/include/domain/osextensions/$$1)
     314             return ($${epocroot_prefix}epoc32/include/domain/osextensions/$$1)
    297315        }
    298316        defineReplace(OS_LAYER_PLATFORM_EXPORT_PATH) {
    299              return (/epoc32/include/domain/osextensions/$$1)
     317             return ($${epocroot_prefix}epoc32/include/domain/osextensions/$$1)
    300318        }
    301319
    … …  
    324342
    325343        APP_LAYER_SYSTEMINCLUDE = \
    326          /epoc32/include \
    327          /epoc32/include/oem \
    328          /epoc32/include/middleware \
    329          /epoc32/include/domain/middleware \
    330          /epoc32/include/osextensions \
    331          /epoc32/include/domain/osextensions \
    332          /epoc32/include/applications \
    333          /epoc32/include/domain/applications \
    334          /epoc32/include/domain/osextensions/loc \
    335          /epoc32/include/domain/middleware/loc \
    336          /epoc32/include/domain/applications/loc \
    337          /epoc32/include/domain/osextensions/loc/sc \
    338          /epoc32/include/domain/middleware/loc/sc \
    339          /epoc32/include/domain/applications/loc/sc
     344         $${epocroot_prefix}epoc32/include \
     345         $${epocroot_prefix}epoc32/include/oem \
     346         $${epocroot_prefix}epoc32/include/middleware \
     347         $${epocroot_prefix}epoc32/include/domain/middleware \
     348         $${epocroot_prefix}epoc32/include/osextensions \
     349         $${epocroot_prefix}epoc32/include/domain/osextensions \
     350         $${epocroot_prefix}epoc32/include/applications \
     351         $${epocroot_prefix}epoc32/include/domain/applications \
     352         $${epocroot_prefix}epoc32/include/domain/osextensions/loc \
     353         $${epocroot_prefix}epoc32/include/domain/middleware/loc \
     354         $${epocroot_prefix}epoc32/include/domain/applications/loc \
     355         $${epocroot_prefix}epoc32/include/domain/osextensions/loc/sc \
     356         $${epocroot_prefix}epoc32/include/domain/middleware/loc/sc \
     357         $${epocroot_prefix}epoc32/include/domain/applications/loc/sc
    340358
    341359        # This define statements defines the include paths, which are intended to be
    … …  
    345363
    346364        MW_LAYER_SYSTEMINCLUDE = \
    347          /epoc32/include \
    348          /epoc32/include/oem \
    349          /epoc32/include/middleware \
    350          /epoc32/include/domain/middleware \
    351          /epoc32/include/osextensions \
    352          /epoc32/include/domain/osextensions \
    353          /epoc32/include/domain/osextensions/loc \
    354          /epoc32/include/domain/middleware/loc \
    355          /epoc32/include/domain/osextensions/loc/sc \
    356          /epoc32/include/domain/middleware/loc/sc
     365         $${epocroot_prefix}epoc32/include \
     366         $${epocroot_prefix}epoc32/include/oem \
     367         $${epocroot_prefix}epoc32/include/middleware \
     368         $${epocroot_prefix}epoc32/include/domain/middleware \
     369         $${epocroot_prefix}epoc32/include/osextensions \
     370         $${epocroot_prefix}epoc32/include/domain/osextensions \
     371         $${epocroot_prefix}epoc32/include/domain/osextensions/loc \
     372         $${epocroot_prefix}epoc32/include/domain/middleware/loc \
     373         $${epocroot_prefix}epoc32/include/domain/osextensions/loc/sc \
     374         $${epocroot_prefix}epoc32/include/domain/middleware/loc/sc
    357375
    358376        # This define statements defines the include paths, which are intended to be
    … …  
    362380
    363381        OS_LAYER_SYSTEMINCLUDE = \
    364          /epoc32/include \
    365          /epoc32/include/oem \
    366          /epoc32/include/osextensions \
    367          /epoc32/include/domain/osextensions \
    368          /epoc32/include/domain/osextensions/loc \
    369          /epoc32/include/domain/osextensions/loc/sc
     382         $${epocroot_prefix}epoc32/include \
     383         $${epocroot_prefix}epoc32/include/oem \
     384         $${epocroot_prefix}epoc32/include/osextensions \
     385         $${epocroot_prefix}epoc32/include/domain/osextensions \
     386         $${epocroot_prefix}epoc32/include/domain/osextensions/loc \
     387         $${epocroot_prefix}epoc32/include/domain/osextensions/loc/sc
    370388
    371389        # This define statements defines the include paths, which are intended to be
    … …  
    376394
    377395        OS_LAYER_KERNEL_SYSTEMINCLUDE = \
    378          /epoc32/include/oem \
    379          /epoc32/include/osextensions \
    380          /epoc32/include/domain/osextensions
     396         $${epocroot_prefix}epoc32/include/oem \
     397         $${epocroot_prefix}epoc32/include/osextensions \
     398         $${epocroot_prefix}epoc32/include/domain/osextensions
    381399
    382400
    … …  
    388406        OS_LAYER_LIBC_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis) \
    389407                                      $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/sys) \
    390                                       /epoc32/include/stdapis \
    391                                       /epoc32/include/stdapis/sys
     408                                      $${epocroot_prefix}epoc32/include/stdapis \
     409                                      $${epocroot_prefix}epoc32/include/stdapis/sys
    392410
    393411        OS_LAYER_GLIB_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/glib-2.0) \
    394412                                      $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/glib-2.0/glib) \
    395413                                      $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/glib-2.0/gObject) \
    396                                       /epoc32/include/stdapis/glib-2.0 \
    397                                       /epoc32/include/stdapis/glib-2.0/glib \
    398                                       /epoc32/include/stdapis/glib-2.0/gObject
     414                                      $${epocroot_prefix}epoc32/include/stdapis/glib-2.0 \
     415                                      $${epocroot_prefix}epoc32/include/stdapis/glib-2.0/glib \
     416                                      $${epocroot_prefix}epoc32/include/stdapis/glib-2.0/gObject
    399417
    400418        OS_LAYER_SSL_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/openssl) \
    401                                      /epoc32/include/stdapis/openssl
     419                                     $${epocroot_prefix}epoc32/include/stdapis/openssl
    402420
    403421        # stlportv5 is preferred over stlport as it has the throwing version of operator new
    404422        OS_LAYER_STDCPP_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/stlportv5) \
    405                                         /epoc32/include/stdapis/stlportv5
     423                                        $${epocroot_prefix}epoc32/include/stdapis/stlportv5
    406424        exists($${EPOCROOT}epoc32/include/osextensions/stdapis/stlport) \
    407425        |exists($${EPOCROOT}epoc32/include/stdapis/stlport) {
    … …  
    409427            :!exists($${EPOCROOT}epoc32/include/stdapis/stlportv5) {
    410428                OS_LAYER_STDCPP_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/stlport) \
    411                                                 /epoc32/include/stdapis/stlport
     429                                                $${epocroot_prefix}epoc32/include/stdapis/stlport
    412430            }
    413431        }
    414432       
    415433        OS_LAYER_BOOST_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/boost) \
    416                                        /epoc32/include/stdapis/boost
     434                                       $${epocroot_prefix}epoc32/include/stdapis/boost
    417435
    418436        OS_LAYER_DBUS_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/dbus-1.0) \
    419437                                      $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/dbus-1.0/dbus) \
    420                                       /epoc32/include/stdapis/dbus-1.0 \
    421                                       /epoc32/include/stdapis/dbus-1.0/dbus
     438                                      $${epocroot_prefix}epoc32/include/stdapis/dbus-1.0 \
     439                                      $${epocroot_prefix}epoc32/include/stdapis/dbus-1.0/dbus
    422440
    423441        OS_LAYER_LIBUTILITY_SYSTEMINCLUDE = $$OS_LAYER_PLATFORM_EXPORT_PATH(stdapis/utility) \
    424                                             /epoc32/include/stdapis/utility
     442                                            $${epocroot_prefix}epoc32/include/stdapis/utility
    425443
    426444    }
    … …  
    434452
    435453    defineReplace(CORE_APP_LAYER_IBY_EXPORT_PATH) {
    436         return(/epoc32/rom/include/core/app/$$1)
     454        return($${epocroot_prefix}epoc32/rom/include/core/app/$$1)
    437455    }
    438456    defineReplace(CORE_MW_LAYER_IBY_EXPORT_PATH) {
    439         return(/epoc32/rom/include/core/mw/$$1)
     457        return($${epocroot_prefix}epoc32/rom/include/core/mw/$$1)
    440458    }
    441459
    442460    defineReplace(LANGUAGE_APP_LAYER_IBY_EXPORT_PATH) {
    443         return(/epoc32/rom/include/language/app/$$1)
     461        return($${epocroot_prefix}epoc32/rom/include/language/app/$$1)
    444462    }
    445463    defineReplace(LANGUAGE_MW_LAYER_IBY_EXPORT_PATH) {
    446         return(/epoc32/rom/include/language/mw/$$1)
     464        return($${epocroot_prefix}epoc32/rom/include/language/mw/$$1)
    447465    }
    448466
    449467    defineReplace(CUSTOMER_APP_LAYER_IBY_EXPORT_PATH) {
    450         return(/epoc32/rom/include/customer/app/$$1)
     468        return($${epocroot_prefix}epoc32/rom/include/customer/app/$$1)
    451469    }
    452470    defineReplace(CUSTOMER_MW_LAYER_IBY_EXPORT_PATH) {
    453         return(/epoc32/rom/include/customer/mw/$$1)
     471        return($${epocroot_prefix}epoc32/rom/include/customer/mw/$$1)
    454472    }
    455473
    456474    defineReplace(CUSTOMER_VARIANT_APP_LAYER_IBY_EXPORT_PATH) {
    457         return(/epoc32/rom/include/customervariant/app/$$1)
     475        return($${epocroot_prefix}epoc32/rom/include/customervariant/app/$$1)
    458476    }
    459477    defineReplace(CUSTOMER_VARIANT_MW_LAYER_IBY_EXPORT_PATH) {
    460         return(/epoc32/rom/include/customervariant/mw/$$1)
     478        return($${epocroot_prefix}epoc32/rom/include/customervariant/mw/$$1)
    461479    }
    462480
    … …  
    467485    STLLIB_USAGE_DEFINES = _WCHAR_T_DECLARED
    468486
     487    # Smart prepend of EPOCROOT to a string
     488    defineReplace(prependEpocroot) {
     489        contains(1, ^$${EPOCROOT}) {
     490            return($$1)
     491        } else {
     492            return($${EPOCROOT}$$replace(1,"^/",))
     493        }
     494    }
     495
    469496}
    470 
    471 
    472    

  • trunk/mkspecs/features/symbian/qt.prf

    r769 r846  
    2626#       while self-signed version typically has temporary UID3 of 0xE001E61C.
    2727contains(CONFIG, qt):!contains(TARGET.UID3, 0x2001E61C):!contains(TARGET.UID3, 0xE001E61C):isEmpty(QT_LIBINFIX) {
     28    qt_pkg_name = Qt
    2829    pkg_depends_qt += \
    2930        "; Default dependency to Qt libraries" \
    30         "(0x2001E61C), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION},  {\"Qt\"}"
     31        "(0x2001E61C), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION}, {$$addLanguageDependentPkgItem(qt_pkg_name)}"
    3132
    3233    # Projects linking to webkit need dependency to webkit
    … …  
    3940        }
    4041
     42        webkit_pkg_name = QtWebKit
    4143        pkg_depends_webkit += \
    4244            "; Dependency to Qt Webkit" \
    43             "(0x200267C2), $${QT_WEBKIT_MAJOR_VERSION}, $${QT_WEBKIT_MINOR_VERSION}, $${QT_WEBKIT_PATCH_VERSION},  {\"QtWebKit\"}"
     45            "(0x200267C2), $${QT_WEBKIT_MAJOR_VERSION}, $${QT_WEBKIT_MINOR_VERSION}, $${QT_WEBKIT_PATCH_VERSION}, {$$addLanguageDependentPkgItem(webkit_pkg_name)}"
    4446    } else {
    4547        default_deployment.pkg_prerules -= pkg_depends_webkit
    … …  
    5153isEmpty(TARGET.EPOCSTACKSIZE):TARGET.EPOCSTACKSIZE = 0x14000
    5254isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x020000 0x800000
     55
     56# Workaround for the fact that Gnupoc and Symbian chose different approaches to
     57# the letter casing of headers.
     58contains(CONFIG, is_using_gnupoc) {
     59    INCLUDEPATH += $${PWD}/../../common/symbian/header-wrappers
     60}

  • trunk/mkspecs/features/symbian/stl.prf

    r769 r846  
    1313# Remove mkspecs/common/symbian/stl-off from beginning of includepath
    1414# in order to use new and delete operators from STL
    15 INCLUDEPATH -= $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian/stl-off
     15INCLUDEPATH -= $$[QT_INSTALL_DATA]/mkspecs/common/symbian/stl-off
    1616
    1717# libstdcppv5 is preferred over libstdcpp as it has/uses the throwing version of operator new
    18 STL_LIB = -llibstdcppv5.dll
    19 
    2018# STDCPP turns on standard C++ new behaviour (ie. throwing new)
    21 STL_MMP_RULE = "STDCPP"
     19use_libstdcppv5 = true
    2220
    2321# Fall back to old implementation if that is the only one that is found
    24 exists($${EPOCROOT}epoc32/release/armv5/urel/libstdcpp.dll)|exists($${EPOCROOT}epoc32/release/winscw/udeb/libstdcpp.dll) {
    25     !exists($${EPOCROOT}epoc32/release/armv5/urel/libstdcppv5.dll):!exists($${EPOCROOT}epoc32/release/winscw/udeb/libstdcppv5.dll) {
    26         STL_LIB = -llibstdcpp.dll
    27         STL_MMP_RULE =
     22exists($${EPOCROOT}epoc32/release/armv5/lib/libstdcpp.dso)|exists($${EPOCROOT}epoc32/release/winscw/udeb/libstdcpp.dll) {
     23    !exists($${EPOCROOT}epoc32/release/armv5/lib/libstdcppv5.dso):!exists($${EPOCROOT}epoc32/release/winscw/udeb/libstdcppv5.dll) {
     24        use_libstdcppv5 = false
    2825    }
    2926}
    3027
    31 LIBS *= $$STL_LIB
    32 MMP_RULES *= $$STL_MMP_RULE
     28equals(use_libstdcppv5, true) {
     29    LIBS *= -llibstdcppv5.dll
     30    symbian-abld|symbian-sbsv2 {
     31        MMP_RULES *= "STDCPP"
     32    } else {
     33        DEFINES *= __SYMBIAN_STDCPP_SUPPORT__
     34        LIBS *= -lstdnew.dll
     35    }
     36} else {
     37    LIBS *= -llibstdcpp.dll
     38}
     39
     40# use the runtime support for nested exceptions, if a library is available
     41exists($${EPOCROOT}epoc32/release/armv5/urel/usrt_nx_*.lib) {
     42    CONFIG += nested_exceptions
     43}

  • trunk/mkspecs/features/uic.prf

    r769 r846  
    8787           EMBEDDED_IMAGES += $$image
    8888           count(EMBEDDED_IMAGES, 5) {
    89                 isEmpty(RET): RET += echo $$EMBEDDED_IMAGES > images.tmp $$escape_expand(\n\t)
    90                 else:         RET += echo $$EMBEDDED_IMAGES >> images.tmp $$escape_expand(\n\t)
     89                isEmpty(RET): RET += echo $$EMBEDDED_IMAGES > $${UI_DIR}/images.tmp $$escape_expand(\\n\\t)
     90                else:         RET += echo $$EMBEDDED_IMAGES >> $${UI_DIR}/images.tmp $$escape_expand(\\n\\t)
    9191                unset(EMBEDDED_IMAGES)
    9292           }
    9393    }
    94     !isEmpty(EMBEDDED_IMAGES):RET += echo $$EMBEDDED_IMAGES >> images.tmp $$escape_expand(\n\t)
     94    !isEmpty(EMBEDDED_IMAGES):RET += echo $$EMBEDDED_IMAGES >> $${UI_DIR}/images.tmp $$escape_expand(\\n\\t)
    9595    !isEmpty(RET) {
    96         RET += $$QMAKE_UIC3 -embed $$TARGET -f images.tmp -o $$2 $$escape_expand(\n\t)
     96        RET += $$QMAKE_UIC3 -embed $$TARGET -f $${UI_DIR}/images.tmp -o $$2 $$escape_expand(\\n\\t)
    9797        return($$RET)
    9898    }
    … …  
    100100}
    101101
    102 image_collection.output = qmake_image_collection$${first(QMAKE_EXT_CPP)}
     102image_collection.output = $${UI_DIR}/qmake_image_collection$${first(QMAKE_EXT_CPP)}
    103103image_collection.variable_out = SOURCES
    104104image_collection.input = IMAGES
    … …  
    110110} else {
    111111    image_collection.commands = ${QMAKE_FUNC_imageCollectionCmd}
    112     silent:image_collection.commands = @echo uic3 -embed $$TARGET -f images.tmp && $image_collection.commands
     112    silent:image_collection.commands = @echo uic3 -embed $$TARGET -f $${UI_DIR}/images.tmp && $image_collection.commands
    113113}
    114114QMAKE_EXTRA_COMPILERS += image_collection

  • trunk/mkspecs/features/unix/opengl.prf

    r561 r846  
    44    target_qt:LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL_ES1
    55    else:LIBS += $$QMAKE_LIBS_OPENGL_ES1
    6 } else:contains(QT_CONFIG, opengles1cl) {
    7     INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES1CL
    8     !isEmpty(QMAKE_LIBDIR_OPENGL_ES1CL):QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL_ES1CL
    9     target_qt:LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL_ES1CL
    10     else:LIBS += $$QMAKE_LIBS_OPENGL_ES1CL
    116} else:contains(QT_CONFIG, opengles2) {
    127    INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2

  • trunk/mkspecs/features/unix/separate_debug_info.prf

    r561 r846  
    11
    22!separate_debug_info_nocopy:!staticlib:!static:!contains(TEMPLATE, subdirs):!isEmpty(QMAKE_OBJCOPY) {
    3     QMAKE_SEPARATE_DEBUG_INFO = (test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\" ; targ=`basename $(TARGET)`; $$QMAKE_OBJCOPY --only-keep-debug \"\$\$targ\" \"\$\$targ.debug\" && $$QMAKE_OBJCOPY --strip-debug \"\$\$targ\" && $$QMAKE_OBJCOPY --add-gnu-debuglink=\"\$\$targ.debug\" \"\$\$targ\" && chmod -x \"\$\$targ.debug\" ) ;
    4     QMAKE_INSTALL_SEPARATE_DEBUG_INFO = test -z "$(DESTDIR)" || cd \"$(DESTDIR)\" ; $(INSTALL_FILE) `basename $(TARGET)`.debug $(INSTALL_ROOT)/\$\$target_path/
     3    QMAKE_SEPARATE_DEBUG_INFO = test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\" ; targ=`basename $(TARGET)`; $$QMAKE_OBJCOPY --only-keep-debug \"\$\$targ\" \"\$\$targ.debug\" && $$QMAKE_OBJCOPY --strip-debug \"\$\$targ\" && $$QMAKE_OBJCOPY --add-gnu-debuglink=\"\$\$targ.debug\" \"\$\$targ\" && chmod -x \"\$\$targ.debug\"
     4    QMAKE_INSTALL_SEPARATE_DEBUG_INFO = test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\" ; $(INSTALL_FILE) `basename $(TARGET)`.debug $(INSTALL_ROOT)/\$\$target_path/
    55
     6    !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$escape_expand(\\n\\t)$$QMAKE_POST_LINK
    67    QMAKE_POST_LINK = $$QMAKE_SEPARATE_DEBUG_INFO $$QMAKE_POST_LINK
    78    silent:QMAKE_POST_LINK = @echo creating $@.debug && $$QMAKE_POST_LINK

  • trunk/mkspecs/features/vxworks.prf

    r561 r846  
    2323shared|!staticlib:!lib {
    2424    *-dcc {
    25     VXWORKS_MUNCH_CMD = (targ=`basename $(TARGET)`; \
     25    VXWORKS_MUNCH_CMD =  targ=`basename $(TARGET)`; \
    2626                         ddump -Ng \"$(TARGET)\" | tclsh $$VXWORKS_MUNCH_TOOL -c $$VXWORKS_ARCH_MUNCH >\"$(OBJECTS_DIR)/\$\${targ}_ctdt.c\" && \
    2727                         $$QMAKE_CC -c $$QMAKE_CFLAGS \"$(OBJECTS_DIR)/\$\${targ}_ctdt.c\" -o \"$(OBJECTS_DIR)/\$\${targ}_ctdt.o\" && \
    2828                         $$QMAKE_LINK $$QMAKE_LFLAGS -X -r5 -r4 \"$(OBJECTS_DIR)/\$\${targ}_ctdt.o\" \"$(TARGET)\" -o \"$(TARGET).munched\" && \
    2929                         mv \"$(TARGET).munched\" \"$(TARGET)\" && \
    30                          chmod +x \"$(TARGET)\")
     30                         chmod +x \"$(TARGET)\"
    3131    }
    3232    *-g++ {
    33     VXWORKS_MUNCH_CMD = (targ=`basename $(TARGET)`; \
     33    VXWORKS_MUNCH_CMD =  targ=`basename $(TARGET)`; \
    3434                         nm \"$(DESTDIR)$(TARGET)\" | tclsh $$VXWORKS_MUNCH_TOOL -c $$VXWORKS_ARCH_MUNCH >\"$(OBJECTS_DIR)/\$\${targ}_ctdt.c\" && \
    3535                         $$QMAKE_CC -c $$QMAKE_CFLAGS -fdollars-in-identifiers \"$(OBJECTS_DIR)/\$\${targ}_ctdt.c\" -o \"$(OBJECTS_DIR)/\$\${targ}_ctdt.o\" && \
    3636                         $$QMAKE_LINK $$QMAKE_LFLAGS -nostdlib -Wl,-X -T $(WIND_BASE)/target/h/tool/gnu/ldscripts/link.OUT \"$(OBJECTS_DIR)/\$\${targ}_ctdt.o\" \"$(DESTDIR)$(TARGET)\" -o \"$(DESTDIR)$(TARGET).munched\" && \
    3737                         mv \"$(DESTDIR)$(TARGET).munched\" \"$(DESTDIR)$(TARGET)\" && \
    38                          chmod +x \"$(DESTDIR)$(TARGET)\")
     38                         chmod +x \"$(DESTDIR)$(TARGET)\"
    3939    }
    4040
    … …  
    4949    }
    5050
    51     QMAKE_POST_LINK = $$VXWORKS_MUNCH_CMD $$QMAKE_POST_LINK
     51    !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$escape_expand(\\n\\t)$$QMAKE_POST_LINK
     52    QMAKE_POST_LINK = $$VXWORKS_MUNCH_CMD$$QMAKE_POST_LINK
    5253    silent:QMAKE_POST_LINK = @echo creating $@.$$VXWORKS_MUNCH_EXT && $$QMAKE_POST_LINK
    5354

  • trunk/mkspecs/features/win32/embed_manifest_dll.prf

    r561 r846  
    11MANIFEST_DIR = $$OBJECTS_DIR
    22isEmpty(MANIFEST_DIR):MANIFEST_DIR = .
    3 !if(plugin:no_plugin_manifest):if(win32-msvc2005|win32-msvc2008):!static:!equals(TEMPLATE_PREFIX, "vc"):equals(TEMPLATE, "lib") {
     3!if(plugin:no_plugin_manifest):if(win32-msvc2005*|win32-msvc2008*|win32-msvc2010*):!static:!equals(TEMPLATE_PREFIX, "vc"):equals(TEMPLATE, "lib") {
    44    NOPATH_TARGET = $$TARGET
    5     NOPATH_TARGET ~= s,\\ , ,q      # Remove space escaping (NOPATH_TARGET is quoted)
    6     NOPATH_TARGET ~= s,\\,/,g       # Change to single type separators
     5    NOPATH_TARGET ~= s,\\\\ , ,q    # Remove space escaping (NOPATH_TARGET is quoted)
     6    NOPATH_TARGET ~= s,\\\\,/,g     # Change to single type separators
    77    NOPATH_TARGET ~= s,^(.*/)+,,    # Remove all paths
    88    QMAKE_LFLAGS += /MANIFEST $$quote(/MANIFESTFILE:\"$${MANIFEST_DIR}\\$${NOPATH_TARGET}.intermediate.manifest\")
    9     QMAKE_PREV_POST_LINK = $$QMAKE_POST_LINK
    10     QMAKE_POST_LINK = $$quote(mt.exe -nologo -manifest \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\" -outputresource:$(DESTDIR_TARGET);2$$escape_expand(\n\t))
    11     QMAKE_POST_LINK += $$QMAKE_PREV_POST_LINK
     9    !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$escape_expand(\\n\\t)$$QMAKE_POST_LINK
     10    QMAKE_POST_LINK = $$quote(mt.exe -nologo -manifest \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\" -outputresource:$(DESTDIR_TARGET);2$$escape_expand(\\n\\t))$$QMAKE_POST_LINK
    1211    QMAKE_CLEAN += \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\"
    1312}

  • trunk/mkspecs/features/win32/embed_manifest_exe.prf

    r561 r846  
    11MANIFEST_DIR = $$OBJECTS_DIR
    22isEmpty(MANIFEST_DIR):MANIFEST_DIR = .
    3 if(win32-msvc2005|win32-msvc2008):!equals(TEMPLATE_PREFIX, "vc"):equals(TEMPLATE, "app") {
     3if(win32-msvc2005*|win32-msvc2008*|win32-msvc2010*):!equals(TEMPLATE_PREFIX, "vc"):equals(TEMPLATE, "app") {
    44    NOPATH_TARGET = $$TARGET
    5     NOPATH_TARGET ~= s,\\ , ,q      # Remove space escaping (NOPATH_TARGET is quoted)
    6     NOPATH_TARGET ~= s,\\,/,g       # Change to single type separators
     5    NOPATH_TARGET ~= s,\\\\ , ,q    # Remove space escaping (NOPATH_TARGET is quoted)
     6    NOPATH_TARGET ~= s,\\\\,/,g     # Change to single type separators
    77    NOPATH_TARGET ~= s,^(.*/)+,,    # Remove all paths
    88    QMAKE_LFLAGS += /MANIFEST $$quote(/MANIFESTFILE:\"$${MANIFEST_DIR}\\$${NOPATH_TARGET}.intermediate.manifest\")
    9     QMAKE_PREV_POST_LINK = $$QMAKE_POST_LINK
    10     QMAKE_POST_LINK = $$quote(mt.exe -nologo -manifest \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\" -outputresource:$(DESTDIR_TARGET);1$$escape_expand(\n\t))
    11     QMAKE_POST_LINK += $$QMAKE_PREV_POST_LINK
     9    !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$escape_expand(\\n\\t)$$QMAKE_POST_LINK
     10    QMAKE_POST_LINK = $$quote(mt.exe -nologo -manifest \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\" -outputresource:$(DESTDIR_TARGET);1$$escape_expand(\\n\\t))$$QMAKE_POST_LINK
    1211    QMAKE_CLEAN += \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\"
    1312}

  • trunk/mkspecs/features/win32/qaxserver.prf

    r769 r846  
    2020    ACTIVEQT_TARGET = "$(TargetPath)"
    2121    win32-msvc {
    22         ACTIVEQT_NEWLINE = $$escape_expand(\t)
     22        ACTIVEQT_NEWLINE = $$escape_expand(\\t)
    2323        ACTIVEQT_OUTPUT = $(IntDir)/$${TARGET}
    2424    } else {
    25         ACTIVEQT_NEWLINE = $$escape_expand(\n\t)
     25        ACTIVEQT_NEWLINE = $$escape_expand(\\n\\t)
    2626        ACTIVEQT_OUTPUT = $(IntDir)$${TARGET}
    2727    }
    … …  
    3232    ACTIVEQT_IDC = -$(IDC)
    3333    ACTIVEQT_IDL = -$(IDL)
    34     ACTIVEQT_NEWLINE = $$escape_expand(\n\t)
     34    ACTIVEQT_NEWLINE = $$escape_expand(\\n\\t)
    3535    ACTIVEQT_TARGET = $(DESTDIR_TARGET)
    3636    ACTIVEQT_OUTPUT = $(OBJECTS_DIR)/$${TARGET}

  • trunk/mkspecs/features/win32/thread.prf

    r2 r846  
    2424}
    2525
    26 win32-msvc|win32-msvc.net {
    27   !contains(DEFINES, QT_DLL):!target_qt:!isEqual(TARGET, qtmain):QMAKE_LFLAGS += /NODEFAULTLIB:"libc"
    28 }
    29 
    3026QMAKE_LIBS += $$QMAKE_LIBS_RTMT

  • trunk/mkspecs/features/yacc.prf

    r2 r846  
    2222
    2323    yacc_decl.commands = \
    24         $$QMAKE_YACC $$QMAKE_YACCDECLFLAGS ${QMAKE_FILE_IN}$$escape_expand(\n\t) \
    25         $$QMAKE_DEL_FILE $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_yacc$${first(QMAKE_EXT_H)} $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_yacc$${first(QMAKE_EXT_CPP)}$$escape_expand(\n\t) \
    26         $$QMAKE_MOVE $${QMAKE_YACC_HEADER} $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_yacc$${first(QMAKE_EXT_H)}$$escape_expand(\n\t) \
    27         $$QMAKE_MOVE $${QMAKE_YACC_SOURCE} $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_yacc$${first(QMAKE_EXT_CPP)}$$escape_expand(\n\t)
     24        $$QMAKE_YACC $$QMAKE_YACCDECLFLAGS ${QMAKE_FILE_IN}$$escape_expand(\\n\\t) \
     25        $$QMAKE_DEL_FILE $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_yacc$${first(QMAKE_EXT_H)} $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_yacc$${first(QMAKE_EXT_CPP)}$$escape_expand(\\n\\t) \
     26        $$QMAKE_MOVE $${QMAKE_YACC_HEADER} $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_yacc$${first(QMAKE_EXT_H)}$$escape_expand(\\n\\t) \
     27        $$QMAKE_MOVE $${QMAKE_YACC_SOURCE} $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_yacc$${first(QMAKE_EXT_CPP)}$$escape_expand(\\n\\t)
    2828    yacc_decl.output = $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_yacc$${first(QMAKE_EXT_H)}
    2929
    … …  
    3636    yacc_impl.input = YACCSOURCES
    3737    yacc_impl.variable_out = GENERATED_SOURCES
    38     yacc_impl.commands = $$escape_expand(\n)        # We don't want any commands where, but if command is empty no rules are created
     38    yacc_impl.commands = $$escape_expand(\\n)        # We don't want any commands where, but if command is empty no rules are created
    3939    yacc_impl.depends = $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_yacc$${first(QMAKE_EXT_H)}    # Make sure we depend on the step above
    4040    yacc_impl.output = $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_yacc$${first(QMAKE_EXT_CPP)}   # Faked output from this step, output really created in step above

  • trunk/mkspecs/freebsd-g++/qmake.conf

    r2 r846  
    44
    55MAKEFILE_GENERATOR      = UNIX
     6TARGET_PLATFORM         = unix
    67TEMPLATE                = app
    78CONFIG                  += qt warn_on release link_prl

  • trunk/mkspecs/freebsd-g++/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)
    … …  
    7777#endif
    7878
    79 #define QT_FOPEN                ::fopen
    80 #define QT_FSEEK                ::fseeko
    81 #define QT_FTELL                ::ftello
    82 #define QT_FGETPOS              ::fgetpos
    83 #define QT_FSETPOS              ::fsetpos
    84 #define QT_MMAP                 ::mmap
    85 #define QT_FPOS_T               fpos_t
    86 #define QT_OFF_T                off_t
     79#include "../common/posix/qplatformdefs.h"
    8780
    88 #define QT_STATBUF              struct stat
    89 #define QT_STATBUF4TSTAT        struct stat
    90 #define QT_STAT                 ::stat
    91 #define QT_FSTAT                ::fstat
    92 #define QT_LSTAT                ::lstat
    93 #define QT_STAT_REG             S_IFREG
    94 #define QT_STAT_DIR             S_IFDIR
    95 #define QT_STAT_MASK            S_IFMT
    96 #define QT_STAT_LNK             S_IFLNK
    97 #define QT_SOCKET_CONNECT       ::connect
    98 #define QT_SOCKET_BIND          ::bind
    99 #define QT_FILENO               fileno
    100 #define QT_OPEN                 ::open
    101 #define QT_CLOSE                ::close
    102 #define QT_TRUNCATE             ::truncate
    103 #define QT_FTRUNCATE            ::ftruncate
    104 #define QT_LSEEK                ::lseek
    105 #define QT_READ                 ::read
    106 #define QT_WRITE                ::write
    107 #define QT_ACCESS               ::access
    108 #define QT_GETCWD               ::getcwd
    109 #define QT_CHDIR                ::chdir
    110 #define QT_MKDIR                ::mkdir
    111 #define QT_RMDIR                ::rmdir
     81#undef QT_OPEN_LARGEFILE
     82#undef QT_SOCKLEN_T
     83
    11284#define QT_OPEN_LARGEFILE       0
    113 #define QT_OPEN_RDONLY          O_RDONLY
    114 #define QT_OPEN_WRONLY          O_WRONLY
    115 #define QT_OPEN_RDWR            O_RDWR
    116 #define QT_OPEN_CREAT           O_CREAT
    117 #define QT_OPEN_TRUNC           O_TRUNC
    118 #define QT_OPEN_APPEND          O_APPEND
    119 
    120 #define QT_SIGNAL_RETTYPE       void
    121 #define QT_SIGNAL_ARGS          int
    122 #define QT_SIGNAL_IGNORE        SIG_IGN
    12385
    12486#if !defined(__DragonFly__) && (__FreeBSD_version < 400000)
    12587// FreeBSD 1.0 - 3.5.1
    126 #  define QT_SOCKLEN_T          int
     88#define QT_SOCKLEN_T            int
    12789#else
    12890// FreeBSD 4.0 and better
    129 #  define QT_SOCKLEN_T          socklen_t
     91#define QT_SOCKLEN_T            socklen_t
    13092#endif
    13193
    … …  
    144106#endif
    145107
    146 
    147108#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/freebsd-g++34/qmake.conf

    r2 r846  
    44
    55MAKEFILE_GENERATOR      = UNIX
     6TARGET_PLATFORM         = unix
    67TEMPLATE                = app
    78CONFIG                  += qt warn_on release link_prl
    … …  
    5758QMAKE_LFLAGS_SONAME     = -Wl,-soname,
    5859QMAKE_LFLAGS_THREAD     = -pthread
    59 QMAKE_RPATH             = -Wl,-rpath,
     60QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
    6061
    6162QMAKE_LIBS              =

  • trunk/mkspecs/freebsd-g++34/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)

  • trunk/mkspecs/freebsd-g++40/qmake.conf

    r2 r846  
    44
    55MAKEFILE_GENERATOR      = UNIX
     6TARGET_PLATFORM         = unix
    67TEMPLATE                = app
    78CONFIG                  += qt warn_on release link_prl
    … …  
    5758QMAKE_LFLAGS_SONAME     = -Wl,-soname,
    5859QMAKE_LFLAGS_THREAD     = -pthread
    59 QMAKE_RPATH             = -Wl,-rpath,
     60QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
    6061
    6162QMAKE_LIBS              =

  • trunk/mkspecs/freebsd-g++40/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)

  • trunk/mkspecs/freebsd-icc/qmake.conf

    r2 r846  
    2929
    3030MAKEFILE_GENERATOR      = UNIX
     31TARGET_PLATFORM         = unix
    3132TEMPLATE                = app
    3233CONFIG                  += qt warn_on release link_prl
    … …  
    8081QMAKE_LFLAGS_SONAME     = -Qoption,ld,-soname,
    8182QMAKE_LFLAGS_THREAD     = -mt
    82 QMAKE_RPATH             = -Qoption,ld,-rpath,
     83QMAKE_LFLAGS_RPATH      = -Qoption,ld,-rpath,
    8384
    8485QMAKE_LIBS              =

  • trunk/mkspecs/freebsd-icc/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)

  • trunk/mkspecs/hpux-acc-64/qmake.conf

    r2 r846  
    4747
    4848MAKEFILE_GENERATOR      = UNIX
     49TARGET_PLATFORM         = unix
    4950TEMPLATE                = app
    5051CONFIG                  += qt warn_on release link_prl
    … …  
    9899QMAKE_LFLAGS_THREAD     =
    99100QMAKE_LFLAGS_NOUNDEF    = -Wl,+noallowunsats
    100 QMAKE_RPATH             = -Wl,+b,
     101QMAKE_LFLAGS_RPATH      = -Wl,+b,
    101102QMAKE_HPUX_SHLIB        = 3
    102103QMAKE_EXTENSION_SHLIB   = sl

  • trunk/mkspecs/hpux-acc-64/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)
    … …  
    7777#endif
    7878
    79 #ifdef QT_LARGEFILE_SUPPORT
    80 #define QT_STATBUF              struct stat64
    81 #define QT_STATBUF4TSTAT        struct stat64
    82 #define QT_STAT                 ::stat64
    83 #define QT_FSTAT                ::fstat64
    84 #define QT_LSTAT                ::lstat64
    85 #define QT_OPEN                 ::open64
    86 #define QT_TRUNCATE             ::truncate64
    87 #define QT_FTRUNCATE            ::ftruncate64
    88 #define QT_LSEEK                ::lseek64
    89 #else
    90 #define QT_STATBUF              struct stat
    91 #define QT_STATBUF4TSTAT        struct stat
    92 #define QT_STAT                 ::stat
    93 #define QT_FSTAT                ::fstat
    94 #define QT_LSTAT                ::lstat
    95 #define QT_OPEN                 ::open
    96 #define QT_TRUNCATE             ::truncate
    97 #define QT_FTRUNCATE            ::ftruncate
    98 #define QT_LSEEK                ::lseek
    99 #endif
     79#define QT_USE_XOPEN_LFS_EXTENSIONS
     80#define QT_NO_READDIR64
     81#include "../common/posix/qplatformdefs.h"
    10082
    101 #ifdef QT_LARGEFILE_SUPPORT
    102 #define QT_FOPEN                ::fopen64
    103 #define QT_FSEEK                ::fseeko64
    104 #define QT_FTELL                ::ftello64
    105 #define QT_FGETPOS              ::fgetpos64
    106 #define QT_FSETPOS              ::fsetpos64
    107 #define QT_MMAP                 ::mmap64
    108 #define QT_FPOS_T               fpos64_t
    109 #define QT_OFF_T                off64_t
    110 #else
    111 #define QT_FOPEN                ::fopen
    112 #define QT_FSEEK                ::fseek
    113 #define QT_FTELL                ::ftell
    114 #define QT_FGETPOS              ::fgetpos
    115 #define QT_FSETPOS              ::fsetpos
    116 #define QT_MMAP                 ::mmap
    117 #define QT_FPOS_T               fpos_t
    118 #define QT_OFF_T                long
    119 #endif
     83#undef QT_OPEN_LARGEFILE
     84#undef QT_SOCKLEN_T
    12085
    121 #define QT_STAT_REG             S_IFREG
    122 #define QT_STAT_DIR             S_IFDIR
    123 #define QT_STAT_MASK            S_IFMT
    124 #define QT_STAT_LNK             S_IFLNK
    125 #define QT_SOCKET_CONNECT       ::connect
    126 #define QT_SOCKET_BIND          ::bind
    127 #define QT_FILENO               fileno
    128 #define QT_CLOSE                ::close
    129 #define QT_READ                 ::read
    130 #define QT_WRITE                ::write
    131 #define QT_ACCESS               ::access
    132 #define QT_GETCWD               ::getcwd
    133 #define QT_CHDIR                ::chdir
    134 #define QT_MKDIR                ::mkdir
    135 #define QT_RMDIR                ::rmdir
    13686#define QT_OPEN_LARGEFILE       0
    137 #define QT_OPEN_RDONLY          O_RDONLY
    138 #define QT_OPEN_WRONLY          O_WRONLY
    139 #define QT_OPEN_RDWR            O_RDWR
    140 #define QT_OPEN_CREAT           O_CREAT
    141 #define QT_OPEN_TRUNC           O_TRUNC
    142 #define QT_OPEN_APPEND          O_APPEND
    143 
    144 #define QT_SIGNAL_RETTYPE       void
    145 #define QT_SIGNAL_ARGS          int
    146 #define QT_SIGNAL_IGNORE        SIG_IGN
    147 
    148 #define QT_SOCKLEN_T            int
    149 
     87#define QT_SOCKLEN_T            int
    15088
    15189#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/hpux-acc-o64/qmake.conf

    r2 r846  
    4747
    4848MAKEFILE_GENERATOR      = UNIX
     49TARGET_PLATFORM         = unix
    4950TEMPLATE                = app
    5051CONFIG                  += qt warn_on release link_prl
    … …  
    9596QMAKE_LFLAGS_SONAME     = -Wl,+h,
    9697QMAKE_LFLAGS_NOUNDEF    = -Wl,+noallowunsats
    97 QMAKE_RPATH             = -Wl,+b,
     98QMAKE_LFLAGS_RPATH      = -Wl,+b,
    9899QMAKE_HPUX_SHLIB        = 2
    99100QMAKE_EXTENSION_SHLIB   = sl

  • trunk/mkspecs/hpux-acc-o64/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)
    … …  
    7878#endif
    7979
    80 #ifdef QT_LARGEFILE_SUPPORT
    81 #define QT_STATBUF              struct stat64
    82 #define QT_STATBUF4TSTAT        struct stat64
    83 #define QT_STAT                 ::stat64
    84 #define QT_FSTAT                ::fstat64
    85 #define QT_LSTAT                ::lstat64
    86 #define QT_OPEN                 ::open64
    87 #define QT_TRUNCATE             ::truncate64
    88 #define QT_FTRUNCATE            ::ftruncate64
    89 #define QT_LSEEK                ::lseek64
    90 #else
    91 #define QT_STATBUF              struct stat
    92 #define QT_STATBUF4TSTAT        struct stat
    93 #define QT_STAT                 ::stat
    94 #define QT_FSTAT                ::fstat
    95 #define QT_LSTAT                ::lstat
    96 #define QT_OPEN                 ::open
    97 #define QT_TRUNCATE             ::truncate
    98 #define QT_FTRUNCATE            ::ftruncate
    99 #define QT_LSEEK                ::lseek
    100 #endif
     80#define QT_USE_XOPEN_LFS_EXTENSIONS
     81#define QT_NO_READDIR64
     82#include "../common/posix/qplatformdefs.h"
    10183
    102 #ifdef QT_LARGEFILE_SUPPORT
    103 #define QT_FOPEN                ::fopen64
    104 #define QT_FSEEK                ::fseeko64
    105 #define QT_FTELL                ::ftello64
    106 #define QT_FGETPOS              ::fgetpos64
    107 #define QT_FSETPOS              ::fsetpos64
    108 #define QT_MMAP                 ::mmap64
    109 #define QT_FPOS_T               fpos64_t
    110 #define QT_OFF_T                off64_t
    111 #else
    112 #define QT_FOPEN                ::fopen
    113 #define QT_FSEEK                ::fseek
    114 #define QT_FTELL                ::ftell
    115 #define QT_FGETPOS              ::fgetpos
    116 #define QT_FSETPOS              ::fsetpos
    117 #define QT_MMAP                 ::mmap
    118 #define QT_FPOS_T               fpos_t
    119 #define QT_OFF_T                long
    120 #endif
    121 
    122 #define QT_STAT_REG             S_IFREG
    123 #define QT_STAT_DIR             S_IFDIR
    124 #define QT_STAT_MASK            S_IFMT
    125 #define QT_STAT_LNK             S_IFLNK
    126 #define QT_SOCKET_CONNECT       ::connect
    127 #define QT_SOCKET_BIND          ::bind
    128 #define QT_FILENO               fileno
    129 #define QT_CLOSE                ::close
    130 #define QT_READ                 ::read
    131 #define QT_WRITE                ::write
    132 #define QT_ACCESS               ::access
    133 #define QT_GETCWD               ::getcwd
    134 #define QT_CHDIR                ::chdir
    135 #define QT_MKDIR                ::mkdir
    136 #define QT_RMDIR                ::rmdir
    137 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    138 #define QT_OPEN_RDONLY          O_RDONLY
    139 #define QT_OPEN_WRONLY          O_WRONLY
    140 #define QT_OPEN_RDWR            O_RDWR
    141 #define QT_OPEN_CREAT           O_CREAT
    142 #define QT_OPEN_TRUNC           O_TRUNC
    143 #define QT_OPEN_APPEND          O_APPEND
    144 
    145 #define QT_SIGNAL_RETTYPE       void
    146 #define QT_SIGNAL_ARGS          int
    147 #define QT_SIGNAL_IGNORE        SIG_IGN
    148 
    149 #define QT_SOCKLEN_T            int
    150 
     84#undef QT_SOCKLEN_T
     85#define QT_SOCKLEN_T            int
    15186
    15287#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/hpux-acc/qmake.conf

    r2 r846  
    2626
    2727MAKEFILE_GENERATOR      = UNIX
     28TARGET_PLATFORM         = unix
    2829TEMPLATE                = app
    2930CONFIG                  += qt warn_on release link_prl
    … …  
    7778QMAKE_LFLAGS_THREAD     =
    7879QMAKE_LFLAGS_NOUNDEF    = -Wl,+noallowunsats
    79 QMAKE_RPATH             = -Wl,+b,
     80QMAKE_LFLAGS_RPATH      = -Wl,+b,
    8081QMAKE_HPUX_SHLIB        = 1
    8182QMAKE_EXTENSION_SHLIB   = sl

  • trunk/mkspecs/hpux-acc/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)
    … …  
    8080#endif
    8181
    82 #ifdef QT_LARGEFILE_SUPPORT
    83 #define QT_STATBUF              struct stat64
    84 #define QT_STATBUF4TSTAT        struct stat64
    85 #define QT_STAT                 ::stat64
    86 #define QT_FSTAT                ::fstat64
    87 #define QT_LSTAT                ::lstat64
    88 #define QT_OPEN                 ::open64
    89 #define QT_TRUNCATE             ::truncate64
    90 #define QT_FTRUNCATE            ::ftruncate64
    91 #define QT_LSEEK                ::lseek64
    92 #else
    93 #define QT_STATBUF              struct stat
    94 #define QT_STATBUF4TSTAT        struct stat
    95 #define QT_STAT                 ::stat
    96 #define QT_FSTAT                ::fstat
    97 #define QT_LSTAT                ::lstat
    98 #define QT_OPEN                 ::open
    99 #define QT_TRUNCATE             ::truncate
    100 #define QT_FTRUNCATE            ::ftruncate
    101 #define QT_LSEEK                ::lseek
    102 #endif
     82#define QT_USE_XOPEN_LFS_EXTENSIONS
     83#define QT_NO_READDIR64
     84#include "../common/posix/qplatformdefs.h"
    10385
    104 #ifdef QT_LARGEFILE_SUPPORT
    105 #define QT_FOPEN                ::fopen64
    106 #define QT_FSEEK                ::fseeko64
    107 #define QT_FTELL                ::ftello64
    108 #define QT_FGETPOS              ::fgetpos64
    109 #define QT_FSETPOS              ::fsetpos64
    110 #define QT_MMAP                 ::mmap64
    111 #define QT_FPOS_T               fpos64_t
    112 #define QT_OFF_T                off64_t
    113 #else
    114 #define QT_FOPEN                ::fopen
    115 #define QT_FSEEK                ::fseek
    116 #define QT_FTELL                ::ftell
    117 #define QT_FGETPOS              ::fgetpos
    118 #define QT_FSETPOS              ::fsetpos
    119 #define QT_MMAP                 ::mmap
    120 #define QT_FPOS_T               fpos_t
    121 #define QT_OFF_T                long
    122 #endif
     86#undef QT_OPEN_LARGEFILE
     87#undef QT_SOCKLEN_T
    12388
    124 #define QT_STAT_REG             S_IFREG
    125 #define QT_STAT_DIR             S_IFDIR
    126 #define QT_STAT_MASK            S_IFMT
    127 #define QT_STAT_LNK             S_IFLNK
    128 #define QT_SOCKET_CONNECT       ::connect
    129 #define QT_SOCKET_BIND          ::bind
    130 #define QT_FILENO               fileno
    131 #define QT_CLOSE                ::close
    132 #define QT_READ                 ::read
    133 #define QT_WRITE                ::write
    134 #define QT_ACCESS               ::access
    135 #define QT_GETCWD               ::getcwd
    136 #define QT_CHDIR                ::chdir
    137 #define QT_MKDIR                ::mkdir
    138 #define QT_RMDIR                ::rmdir
    13989#define QT_OPEN_LARGEFILE       0
    140 #define QT_OPEN_RDONLY          O_RDONLY
    141 #define QT_OPEN_WRONLY          O_WRONLY
    142 #define QT_OPEN_RDWR            O_RDWR
    143 #define QT_OPEN_CREAT           O_CREAT
    144 #define QT_OPEN_TRUNC           O_TRUNC
    145 #define QT_OPEN_APPEND          O_APPEND
    146 
    147 #define QT_SIGNAL_RETTYPE       void
    148 #define QT_SIGNAL_ARGS          int
    149 #define QT_SIGNAL_IGNORE        SIG_IGN
    150 
    151 #define QT_SOCKLEN_T            int
     90#define QT_SOCKLEN_T            int
    15291
    15392// presence of _XOPEN_UNIX can be used to detect HP-UX 10 or higher
    … …  
    15796#endif
    15897
    159 
    16098#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/hpux-g++-64/qmake.conf

    r561 r846  
    77
    88MAKEFILE_GENERATOR      = UNIX
     9TARGET_PLATFORM         = unix
    910TEMPLATE                = app
    1011CONFIG                  += qt warn_on release link_prl
    … …  
    6061QMAKE_LFLAGS_THREAD     =
    6162QMAKE_LFLAGS_NOUNDEF    = -Wl,+noallowunsats
    62 QMAKE_RPATH             = -Wl,+b,
     63QMAKE_LFLAGS_RPATH      = -Wl,+b,
    6364QMAKE_HPUX_SHLIB        = 3
    6465QMAKE_EXTENSION_SHLIB   = sl

  • trunk/mkspecs/hpux-g++-64/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)
    … …  
    7777#endif
    7878
    79 #ifdef QT_LARGEFILE_SUPPORT
    80 #define QT_STATBUF              struct stat64
    81 #define QT_STATBUF4TSTAT        struct stat64
    82 #define QT_STAT                 ::stat64
    83 #define QT_FSTAT                ::fstat64
    84 #define QT_LSTAT                ::lstat64
    85 #define QT_OPEN                 ::open64
    86 #define QT_TRUNCATE             ::truncate64
    87 #define QT_FTRUNCATE            ::ftruncate64
    88 #define QT_LSEEK                ::lseek64
    89 #else
    90 #define QT_STATBUF              struct stat
    91 #define QT_STATBUF4TSTAT        struct stat
    92 #define QT_STAT                 ::stat
    93 #define QT_FSTAT                ::fstat
    94 #define QT_LSTAT                ::lstat
    95 #define QT_OPEN                 ::open
    96 #define QT_TRUNCATE             ::truncate
    97 #define QT_FTRUNCATE            ::ftruncate
    98 #define QT_LSEEK                ::lseek
    99 #endif
    100 
    101 #ifdef QT_LARGEFILE_SUPPORT
    102 #define QT_FOPEN                ::fopen64
    103 #define QT_FSEEK                ::fseeko64
    104 #define QT_FTELL                ::ftello64
    105 #define QT_FGETPOS              ::fgetpos64
    106 #define QT_FSETPOS              ::fsetpos64
    107 #define QT_MMAP                 ::mmap64
    108 #define QT_FPOS_T               fpos64_t
    109 #define QT_OFF_T                off64_t
    110 #else
    111 #define QT_FOPEN                ::fopen
    112 #define QT_FSEEK                ::fseek
    113 #define QT_FTELL                ::ftell
    114 #define QT_FGETPOS              ::fgetpos
    115 #define QT_FSETPOS              ::fsetpos
    116 #define QT_MMAP                 ::mmap
    117 #define QT_FPOS_T               fpos_t
    118 #define QT_OFF_T                long
    119 #endif
    120 
    121 #define QT_STAT_REG             S_IFREG
    122 #define QT_STAT_DIR             S_IFDIR
    123 #define QT_STAT_MASK            S_IFMT
    124 #define QT_STAT_LNK             S_IFLNK
    125 #define QT_SOCKET_CONNECT       ::connect
    126 #define QT_SOCKET_BIND          ::bind
    127 #define QT_FILENO               fileno
    128 #define QT_CLOSE                ::close
    129 #define QT_READ                 ::read
    130 #define QT_WRITE                ::write
    131 #define QT_ACCESS               ::access
    132 #define QT_GETCWD               ::getcwd
    133 #define QT_CHDIR                ::chdir
    134 #define QT_MKDIR                ::mkdir
    135 #define QT_RMDIR                ::rmdir
    136 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    137 #define QT_OPEN_RDONLY          O_RDONLY
    138 #define QT_OPEN_WRONLY          O_WRONLY
    139 #define QT_OPEN_RDWR            O_RDWR
    140 #define QT_OPEN_CREAT           O_CREAT
    141 #define QT_OPEN_TRUNC           O_TRUNC
    142 #define QT_OPEN_APPEND          O_APPEND
    143 
    144 #define QT_SIGNAL_RETTYPE       void
    145 #define QT_SIGNAL_ARGS          int
    146 #define QT_SIGNAL_IGNORE        SIG_IGN
    147 
    148 #define QT_SOCKLEN_T            socklen_t
    149 
     79#define QT_USE_XOPEN_LFS_EXTENSIONS
     80#define QT_NO_READDIR64
     81#include "../common/posix/qplatformdefs.h"
    15082
    15183#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/hpux-g++/qmake.conf

    r2 r846  
    77
    88MAKEFILE_GENERATOR      = UNIX
     9TARGET_PLATFORM         = unix
    910TEMPLATE                = app
    1011CONFIG                  += qt warn_on release link_prl plugin_no_soname
    … …  
    6061QMAKE_LFLAGS_THREAD     =
    6162QMAKE_LFLAGS_NOUNDEF    = -Wl,+noallowunsats
    62 QMAKE_RPATH             = -Wl,+b,
     63QMAKE_LFLAGS_RPATH      = -Wl,+b,
    6364QMAKE_HPUX_SHLIB        = 1
    6465QMAKE_EXTENSION_SHLIB   = sl

  • trunk/mkspecs/hpux-g++/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)
    … …  
    7979#endif
    8080
    81 #ifdef QT_LARGEFILE_SUPPORT
    82 #define QT_STATBUF              struct stat64
    83 #define QT_STATBUF4TSTAT        struct stat64
    84 #define QT_STAT                 ::stat64
    85 #define QT_FSTAT                ::fstat64
    86 #define QT_LSTAT                ::lstat64
    87 #define QT_OPEN                 ::open64
    88 #define QT_TRUNCATE             ::truncate64
    89 #define QT_FTRUNCATE            ::ftruncate64
    90 #define QT_LSEEK                ::lseek64
    91 #else
    92 #define QT_STATBUF              struct stat
    93 #define QT_STATBUF4TSTAT        struct stat
    94 #define QT_STAT                 ::stat
    95 #define QT_FSTAT                ::fstat
    96 #define QT_LSTAT                ::lstat
    97 #define QT_OPEN                 ::open
    98 #define QT_TRUNCATE             ::truncate
    99 #define QT_FTRUNCATE            ::ftruncate
    100 #define QT_LSEEK                ::lseek
    101 #endif
     81#define QT_USE_XOPEN_LFS_EXTENSIONS
     82#define QT_NO_READDIR64
     83#include "../common/posix/qplatformdefs.h"
    10284
    103 #ifdef QT_LARGEFILE_SUPPORT
    104 #define QT_FOPEN                ::fopen64
    105 #define QT_FSEEK                ::fseeko64
    106 #define QT_FTELL                ::ftello64
    107 #define QT_FGETPOS              ::fgetpos64
    108 #define QT_FSETPOS              ::fsetpos64
    109 #define QT_MMAP                 ::mmap64
    110 #define QT_FPOS_T               fpos64_t
    111 #define QT_OFF_T                off64_t
    112 #else
    113 #define QT_FOPEN                ::fopen
    114 #define QT_FSEEK                ::fseek
    115 #define QT_FTELL                ::ftell
    116 #define QT_FGETPOS              ::fgetpos
    117 #define QT_FSETPOS              ::fsetpos
    118 #define QT_MMAP                 ::mmap
    119 #define QT_FPOS_T               fpos_t
    120 #define QT_OFF_T                long
    121 #endif
    122 
    123 #define QT_STAT_REG             S_IFREG
    124 #define QT_STAT_DIR             S_IFDIR
    125 #define QT_STAT_MASK            S_IFMT
    126 #define QT_STAT_LNK             S_IFLNK
    127 #define QT_SOCKET_CONNECT       ::connect
    128 #define QT_SOCKET_BIND          ::bind
    129 #define QT_FILENO               fileno
    130 #define QT_CLOSE                ::close
    131 #define QT_READ                 ::read
    132 #define QT_WRITE                ::write
    133 #define QT_ACCESS               ::access
    134 #define QT_GETCWD               ::getcwd
    135 #define QT_CHDIR                ::chdir
    136 #define QT_MKDIR                ::mkdir
    137 #define QT_RMDIR                ::rmdir
    138 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    139 #define QT_OPEN_RDONLY          O_RDONLY
    140 #define QT_OPEN_WRONLY          O_WRONLY
    141 #define QT_OPEN_RDWR            O_RDWR
    142 #define QT_OPEN_CREAT           O_CREAT
    143 #define QT_OPEN_TRUNC           O_TRUNC
    144 #define QT_OPEN_APPEND          O_APPEND
    145 
    146 #define QT_SIGNAL_RETTYPE       void
    147 #define QT_SIGNAL_ARGS          int
    148 #define QT_SIGNAL_IGNORE        SIG_IGN
    149 
    150 #define QT_SOCKLEN_T            int
     85#undef QT_SOCKLEN_T
     86#define QT_SOCKLEN_T            int
    15187
    15288// presence of _XOPEN_UNIX can be used to detect HP-UX 10 or higher
    … …  
    15692#endif
    15793
    158 
    15994#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/hpuxi-acc-32/qmake.conf

    r2 r846  
    44
    55MAKEFILE_GENERATOR      = UNIX
     6TARGET_PLATFORM         = unix
    67TEMPLATE                = app
    78CONFIG                  += qt warn_on release plugin_no_soname
    … …  
    5455QMAKE_LFLAGS_NOUNDEF    = -Wl,+noallowunsats
    5556QMAKE_LFLAGS_THREAD     =
    56 QMAKE_RPATH             =
     57QMAKE_LFLAGS_RPATH      =
    5758
    5859QMAKE_LIBS              = -lm

  • trunk/mkspecs/hpuxi-acc-32/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)
    … …  
    7878#endif
    7979
    80 #ifdef QT_LARGEFILE_SUPPORT
    81 #define QT_STATBUF              struct stat64
    82 #define QT_STATBUF4TSTAT        struct stat64
    83 #define QT_STAT                 ::stat64
    84 #define QT_FSTAT                ::fstat64
    85 #define QT_LSTAT                ::lstat64
    86 #define QT_OPEN                 ::open64
    87 #define QT_TRUNCATE             ::truncate64
    88 #define QT_FTRUNCATE            ::ftruncate64
    89 #define QT_LSEEK                ::lseek64
    90 #else
    91 #define QT_STATBUF              struct stat
    92 #define QT_STATBUF4TSTAT        struct stat
    93 #define QT_STAT                 ::stat
    94 #define QT_FSTAT                ::fstat
    95 #define QT_LSTAT                ::lstat
    96 #define QT_OPEN                 ::open
    97 #define QT_TRUNCATE             ::truncate
    98 #define QT_FTRUNCATE            ::ftruncate
    99 #define QT_LSEEK                ::lseek
    100 #endif
     80#define QT_USE_XOPEN_LFS_EXTENSIONS
     81#define QT_NO_READDIR64
     82#include "../common/posix/qplatformdefs.h"
    10183
    102 #ifdef QT_LARGEFILE_SUPPORT
    103 #define QT_FOPEN                ::fopen64
    104 #define QT_FSEEK                ::fseeko64
    105 #define QT_FTELL                ::ftello64
    106 #define QT_FGETPOS              ::fgetpos64
    107 #define QT_FSETPOS              ::fsetpos64
    108 #define QT_MMAP                 ::mmap64
    109 #define QT_FPOS_T               fpos64_t
    110 #define QT_OFF_T                off64_t
    111 #else
    112 #define QT_FOPEN                ::fopen
    113 #define QT_FSEEK                ::fseek
    114 #define QT_FTELL                ::ftell
    115 #define QT_FGETPOS              ::fgetpos
    116 #define QT_FSETPOS              ::fsetpos
    117 #define QT_MMAP                 ::mmap
    118 #define QT_FPOS_T               fpos_t
    119 #define QT_OFF_T                long
    120 #endif
     84#undef QT_OPEN_LARGEFILE
     85#undef QT_SOCKLEN_T
    12186
    122 #define QT_STAT_REG             S_IFREG
    123 #define QT_STAT_DIR             S_IFDIR
    124 #define QT_STAT_MASK            S_IFMT
    125 #define QT_STAT_LNK             S_IFLNK
    126 #define QT_SOCKET_CONNECT       ::connect
    127 #define QT_SOCKET_BIND          ::bind
    128 #define QT_FILENO               fileno
    129 #define QT_CLOSE                ::close
    130 #define QT_READ                 ::read
    131 #define QT_WRITE                ::write
    132 #define QT_ACCESS               ::access
    133 #define QT_GETCWD               ::getcwd
    134 #define QT_CHDIR                ::chdir
    135 #define QT_MKDIR                ::mkdir
    136 #define QT_RMDIR                ::rmdir
    13787#define QT_OPEN_LARGEFILE       0
    138 #define QT_OPEN_RDONLY          O_RDONLY
    139 #define QT_OPEN_WRONLY          O_WRONLY
    140 #define QT_OPEN_RDWR            O_RDWR
    141 #define QT_OPEN_CREAT           O_CREAT
    142 #define QT_OPEN_TRUNC           O_TRUNC
    143 #define QT_OPEN_APPEND          O_APPEND
    144 
    145 #define QT_SIGNAL_RETTYPE       void
    146 #define QT_SIGNAL_ARGS          int
    147 #define QT_SIGNAL_IGNORE        SIG_IGN
    148 
    149 #define QT_SOCKLEN_T            int
     88#define QT_SOCKLEN_T            int
    15089
    15190#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/hpuxi-acc-64/qmake.conf

    r2 r846  
    4747
    4848MAKEFILE_GENERATOR      = UNIX
     49TARGET_PLATFORM         = unix
    4950TEMPLATE                = app
    5051CONFIG                  += qt warn_on release plugin_no_soname
    … …  
    9798QMAKE_LFLAGS_THREAD     =
    9899QMAKE_LFLAGS_NOUNDEF    = -Wl,+noallowunsats
    99 QMAKE_RPATH             =
     100QMAKE_LFLAGS_RPATH      =
    100101
    101102QMAKE_LIBS              = -lm

  • trunk/mkspecs/hpuxi-acc-64/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)
    … …  
    7878#endif
    7979
    80 #ifdef QT_LARGEFILE_SUPPORT
    81 #define QT_STATBUF              struct stat64
    82 #define QT_STATBUF4TSTAT        struct stat64
    83 #define QT_STAT                 ::stat64
    84 #define QT_FSTAT                ::fstat64
    85 #define QT_LSTAT                ::lstat64
    86 #define QT_OPEN                 ::open64
    87 #define QT_TRUNCATE             ::truncate64
    88 #define QT_FTRUNCATE            ::ftruncate64
    89 #define QT_LSEEK                ::lseek64
    90 #else
    91 #define QT_STATBUF              struct stat
    92 #define QT_STATBUF4TSTAT        struct stat
    93 #define QT_STAT                 ::stat
    94 #define QT_FSTAT                ::fstat
    95 #define QT_LSTAT                ::lstat
    96 #define QT_OPEN                 ::open
    97 #define QT_TRUNCATE             ::truncate
    98 #define QT_FTRUNCATE            ::ftruncate
    99 #define QT_LSEEK                ::lseek
    100 #endif
     80#define QT_USE_XOPEN_LFS_EXTENSIONS
     81#define QT_NO_READDIR64
     82#include "../common/posix/qplatformdefs.h"
    10183
    102 #ifdef QT_LARGEFILE_SUPPORT
    103 #define QT_FOPEN                ::fopen64
    104 #define QT_FSEEK                ::fseeko64
    105 #define QT_FTELL                ::ftello64
    106 #define QT_FGETPOS              ::fgetpos64
    107 #define QT_FSETPOS              ::fsetpos64
    108 #define QT_MMAP                 ::mmap64
    109 #define QT_FPOS_T               fpos64_t
    110 #define QT_OFF_T                off64_t
    111 #else
    112 #define QT_FOPEN                ::fopen
    113 #define QT_FSEEK                ::fseek
    114 #define QT_FTELL                ::ftell
    115 #define QT_FGETPOS              ::fgetpos
    116 #define QT_FSETPOS              ::fsetpos
    117 #define QT_MMAP                 ::mmap
    118 #define QT_FPOS_T               fpos_t
    119 #define QT_OFF_T                long
    120 #endif
     84#undef QT_OPEN_LARGEFILE
     85#undef QT_SOCKLEN_T
    12186
    122 #define QT_STAT_REG             S_IFREG
    123 #define QT_STAT_DIR             S_IFDIR
    124 #define QT_STAT_MASK            S_IFMT
    125 #define QT_STAT_LNK             S_IFLNK
    126 #define QT_SOCKET_CONNECT       ::connect
    127 #define QT_SOCKET_BIND          ::bind
    128 #define QT_FILENO               fileno
    129 #define QT_CLOSE                ::close
    130 #define QT_READ                 ::read
    131 #define QT_WRITE                ::write
    132 #define QT_ACCESS               ::access
    133 #define QT_GETCWD               ::getcwd
    134 #define QT_CHDIR                ::chdir
    135 #define QT_MKDIR                ::mkdir
    136 #define QT_RMDIR                ::rmdir
    13787#define QT_OPEN_LARGEFILE       0
    138 #define QT_OPEN_RDONLY          O_RDONLY
    139 #define QT_OPEN_WRONLY          O_WRONLY
    140 #define QT_OPEN_RDWR            O_RDWR
    141 #define QT_OPEN_CREAT           O_CREAT
    142 #define QT_OPEN_TRUNC           O_TRUNC
    143 #define QT_OPEN_APPEND          O_APPEND
    144 
    145 #define QT_SIGNAL_RETTYPE       void
    146 #define QT_SIGNAL_ARGS          int
    147 #define QT_SIGNAL_IGNORE        SIG_IGN
    148 
    149 #define QT_SOCKLEN_T            int
     88#define QT_SOCKLEN_T            int
    15089
    15190#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/hpuxi-g++-64/qmake.conf

    r2 r846  
    1212
    1313MAKEFILE_GENERATOR      = UNIX
     14TARGET_PLATFORM         = unix
    1415TEMPLATE                = app
    1516CONFIG                  += qt warn_on release link_prl
    … …  
    6566QMAKE_LFLAGS_THREAD     = -lpthread
    6667QMAKE_LFLAGS_NOUNDEF    = -Wl,+noallowunsats
    67 QMAKE_RPATH             = -Wl,+b,
     68QMAKE_LFLAGS_RPATH      = -Wl,+b,
    6869
    6970QMAKE_LIBS              = -lm

  • trunk/mkspecs/hpuxi-g++-64/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)
    … …  
    7777#endif
    7878
    79 #ifdef QT_LARGEFILE_SUPPORT
    80 #define QT_STATBUF              struct stat64
    81 #define QT_STATBUF4TSTAT        struct stat64
    82 #define QT_STAT                 ::stat64
    83 #define QT_FSTAT                ::fstat64
    84 #define QT_LSTAT                ::lstat64
    85 #define QT_OPEN                 ::open64
    86 #define QT_TRUNCATE             ::truncate64
    87 #define QT_FTRUNCATE            ::ftruncate64
    88 #define QT_LSEEK                ::lseek64
    89 #else
    90 #define QT_STATBUF              struct stat
    91 #define QT_STATBUF4TSTAT        struct stat
    92 #define QT_STAT                 ::stat
    93 #define QT_FSTAT                ::fstat
    94 #define QT_LSTAT                ::lstat
    95 #define QT_OPEN                 ::open
    96 #define QT_TRUNCATE             ::truncate
    97 #define QT_FTRUNCATE            ::ftruncate
    98 #define QT_LSEEK                ::lseek
    99 #endif
     79#define QT_USE_XOPEN_LFS_EXTENSIONS
     80#define QT_NO_READDIR64
     81#include "../common/posix/qplatformdefs.h"
    10082
    101 #ifdef QT_LARGEFILE_SUPPORT
    102 #define QT_FOPEN                ::fopen64
    103 #define QT_FSEEK                ::fseeko64
    104 #define QT_FTELL                ::ftello64
    105 #define QT_FGETPOS              ::fgetpos64
    106 #define QT_FSETPOS              ::fsetpos64
    107 #define QT_MMAP                 ::mmap64
    108 #define QT_FPOS_T               fpos64_t
    109 #define QT_OFF_T                off64_t
    110 #else
    111 #define QT_FOPEN                ::fopen
    112 #define QT_FSEEK                ::fseek
    113 #define QT_FTELL                ::ftell
    114 #define QT_FGETPOS              ::fgetpos
    115 #define QT_FSETPOS              ::fsetpos
    116 #define QT_MMAP                 ::mmap
    117 #define QT_FPOS_T               fpos_t
    118 #define QT_OFF_T                long
    119 #endif
     83#undef QT_OPEN_LARGEFILE
     84#undef QT_SOCKLEN_T
    12085
    121 #define QT_STAT_REG             S_IFREG
    122 #define QT_STAT_DIR             S_IFDIR
    123 #define QT_STAT_MASK            S_IFMT
    124 #define QT_STAT_LNK             S_IFLNK
    125 #define QT_SOCKET_CONNECT       ::connect
    126 #define QT_SOCKET_BIND          ::bind
    127 #define QT_FILENO               fileno
    128 #define QT_CLOSE                ::close
    129 #define QT_READ                 ::read
    130 #define QT_WRITE                ::write
    131 #define QT_ACCESS               ::access
    132 #define QT_GETCWD               ::getcwd
    133 #define QT_CHDIR                ::chdir
    134 #define QT_MKDIR                ::mkdir
    135 #define QT_RMDIR                ::rmdir
    13686#define QT_OPEN_LARGEFILE       0
    137 #define QT_OPEN_RDONLY          O_RDONLY
    138 #define QT_OPEN_WRONLY          O_WRONLY
    139 #define QT_OPEN_RDWR            O_RDWR
    140 #define QT_OPEN_CREAT           O_CREAT
    141 #define QT_OPEN_TRUNC           O_TRUNC
    142 #define QT_OPEN_APPEND          O_APPEND
    143 
    144 #define QT_SIGNAL_RETTYPE       void
    145 #define QT_SIGNAL_ARGS          int
    146 #define QT_SIGNAL_IGNORE        SIG_IGN
    147 
    148 #define QT_SOCKLEN_T            int
     87#define QT_SOCKLEN_T            int
    14988
    15089#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/hurd-g++/qmake.conf

    r2 r846  
    77
    88MAKEFILE_GENERATOR      = UNIX
     9TARGET_PLATFORM         = unix
    910TEMPLATE                = app
    1011QT                      += core gui

  • trunk/mkspecs/hurd-g++/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)
    … …  
    8383#endif
    8484
    85 #define QT_FOPEN                ::fopen
    86 #define QT_FSEEK                ::fseeko
    87 #define QT_FTELL                ::ftello
    88 #define QT_FGETPOS              ::fgetpos
    89 #define QT_FSETPOS              ::fsetpos
    90 #define QT_MMAP                 ::mmap
    91 #define QT_FPOS_T               fpos_t
    92 #define QT_OFF_T                off_t
    93 
    94 #define QT_STATBUF              struct stat
    95 #define QT_STATBUF4TSTAT        struct stat
    96 #define QT_STAT                 ::stat
    97 #define QT_FSTAT                ::fstat
    98 #define QT_LSTAT                ::lstat
    99 #define QT_STAT_REG             S_IFREG
    100 #define QT_STAT_DIR             S_IFDIR
    101 #define QT_STAT_MASK            S_IFMT
    102 #define QT_STAT_LNK             S_IFLNK
    103 #define QT_SOCKET_CONNECT       ::connect
    104 #define QT_SOCKET_BIND          ::bind
    105 #define QT_FILENO               fileno
    106 #define QT_OPEN                 ::open
    107 #define QT_CLOSE                ::close
    108 #define QT_TRUNCATE             ::truncate
    109 #define QT_FTRUNCATE            ::ftruncate
    110 #define QT_LSEEK                ::lseek
    111 #define QT_READ                 ::read
    112 #define QT_WRITE                ::write
    113 #define QT_ACCESS               ::access
    114 #define QT_GETCWD               ::getcwd
    115 #define QT_CHDIR                ::chdir
    116 #define QT_MKDIR                ::mkdir
    117 #define QT_RMDIR                ::rmdir
    118 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    119 #define QT_OPEN_RDONLY          O_RDONLY
    120 #define QT_OPEN_WRONLY          O_WRONLY
    121 #define QT_OPEN_RDWR            O_RDWR
    122 #define QT_OPEN_CREAT           O_CREAT
    123 #define QT_OPEN_TRUNC           O_TRUNC
    124 #define QT_OPEN_APPEND          O_APPEND
    125 
    126 #define QT_SIGNAL_RETTYPE       void
    127 #define QT_SIGNAL_ARGS          int
    128 #define QT_SIGNAL_IGNORE        SIG_IGN
    129 
    130 #define QT_SOCKLEN_T            socklen_t
     85#include "../common/posix/qplatformdefs.h"
    13186
    13287#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
    … …  
    13590#endif
    13691
    137 
    13892#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/irix-cc-64/qmake.conf

    r2 r846  
    3636
    3737MAKEFILE_GENERATOR      = UNIX
     38TARGET_PLATFORM         = unix
    3839TEMPLATE                = app
    3940CONFIG                  += qt warn_on release link_prl
    … …  
    8889QMAKE_LFLAGS_THREAD     =
    8990QMAKE_LFLAGS_NOUNDEF    = -Wl,-no_unresolved
    90 QMAKE_RPATH             = -Wl,-rpath,
     91QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
    9192
    9293QMAKE_LIBS              =

  • trunk/mkspecs/irix-cc-64/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)
    … …  
    7676#endif
    7777
    78 #ifdef QT_LARGEFILE_SUPPORT
    79 #define QT_STATBUF              struct stat64
    80 #define QT_STATBUF4TSTAT        struct stat64
    81 #define QT_STAT                 ::stat64
    82 #define QT_FSTAT                ::fstat64
    83 #define QT_LSTAT                ::lstat64
    84 #define QT_OPEN                 ::open64
    85 #define QT_TRUNCATE             ::truncate64
    86 #define QT_FTRUNCATE            ::ftruncate64
    87 #define QT_LSEEK                ::lseek64
    88 #else
    89 #define QT_STATBUF              struct stat
    90 #define QT_STATBUF4TSTAT        struct stat
    91 #define QT_STAT                 ::stat
    92 #define QT_FSTAT                ::fstat
    93 #define QT_LSTAT                ::lstat
    94 #define QT_OPEN                 ::open
    95 #define QT_TRUNCATE             ::truncate
    96 #define QT_FTRUNCATE            ::ftruncate
    97 #define QT_LSEEK                ::lseek
    98 #endif
     78#define QT_USE_XOPEN_LFS_EXTENSIONS
     79#include "../common/posix/qplatformdefs.h"
    9980
    100 #ifdef QT_LARGEFILE_SUPPORT
    101 #define QT_FOPEN                ::fopen64
    102 #define QT_FSEEK                ::fseeko64
    103 #define QT_FTELL                ::ftello64
    104 #define QT_FGETPOS              ::fgetpos64
    105 #define QT_FSETPOS              ::fsetpos64
    106 #define QT_MMAP                 ::mmap64
    107 #define QT_FPOS_T               fpos64_t
    108 #define QT_OFF_T                off64_t
    109 #else
    110 #define QT_FOPEN                ::fopen
    111 #define QT_FSEEK                ::fseek
    112 #define QT_FTELL                ::ftell
    113 #define QT_FGETPOS              ::fgetpos
    114 #define QT_FSETPOS              ::fsetpos
    115 #define QT_MMAP                 ::mmap
    116 #define QT_FPOS_T               fpos_t
    117 #define QT_OFF_T                long
    118 #endif
    119 
    120 #define QT_STAT_REG             S_IFREG
    121 #define QT_STAT_DIR             S_IFDIR
    122 #define QT_STAT_MASK            S_IFMT
    123 #define QT_STAT_LNK             S_IFLNK
    124 #define QT_SOCKET_CONNECT       ::connect
    125 #define QT_SOCKET_BIND          ::bind
    126 #define QT_FILENO               fileno
    127 #define QT_CLOSE                ::close
    128 #define QT_READ                 ::read
    129 #define QT_WRITE                ::write
    130 #define QT_ACCESS               ::access
    131 #define QT_GETCWD               ::getcwd
    132 #define QT_CHDIR                ::chdir
    133 #define QT_MKDIR                ::mkdir
    134 #define QT_RMDIR                ::rmdir
    135 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    136 #define QT_OPEN_RDONLY          O_RDONLY
    137 #define QT_OPEN_WRONLY          O_WRONLY
    138 #define QT_OPEN_RDWR            O_RDWR
    139 #define QT_OPEN_CREAT           O_CREAT
    140 #define QT_OPEN_TRUNC           O_TRUNC
    141 #define QT_OPEN_APPEND          O_APPEND
    142 
    143 #define QT_SIGNAL_RETTYPE       void
    144 #define QT_SIGNAL_ARGS          int
    145 #define QT_SIGNAL_IGNORE        SIG_IGN
     81#undef QT_SOCKLEN_T
    14682
    14783#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500)
    148 #define QT_SOCKLEN_T            size_t
     84#define QT_SOCKLEN_T            size_t
    14985#else
    150 #define QT_SOCKLEN_T            int
     86#define QT_SOCKLEN_T            int
    15187#endif
    15288
    … …  
    15793#endif
    15894
    159 
    16095#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/irix-cc/qmake.conf

    r2 r846  
    3636
    3737MAKEFILE_GENERATOR      = UNIX
     38TARGET_PLATFORM         = unix
    3839TEMPLATE                = app
    3940CONFIG                  += qt warn_on release link_prl
    … …  
    8889QMAKE_LFLAGS_THREAD     =
    8990QMAKE_LFLAGS_NOUNDEF    = -Wl,-no_unresolved
    90 QMAKE_RPATH             = -Wl,-rpath,
     91QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
    9192
    9293QMAKE_LIBS              =

  • trunk/mkspecs/irix-cc/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)
    … …  
    7676#endif
    7777
    78 #ifdef QT_LARGEFILE_SUPPORT
    79 #define QT_STATBUF              struct stat64
    80 #define QT_STATBUF4TSTAT        struct stat64
    81 #define QT_STAT                 ::stat64
    82 #define QT_FSTAT                ::fstat64
    83 #define QT_LSTAT                ::lstat64
    84 #define QT_OPEN                 ::open64
    85 #define QT_TRUNCATE             ::truncate64
    86 #define QT_FTRUNCATE            ::ftruncate64
    87 #define QT_LSEEK                ::lseek64
    88 #else
    89 #define QT_STATBUF              struct stat
    90 #define QT_STATBUF4TSTAT        struct stat
    91 #define QT_STAT                 ::stat
    92 #define QT_FSTAT                ::fstat
    93 #define QT_LSTAT                ::lstat
    94 #define QT_OPEN                 ::open
    95 #define QT_TRUNCATE             ::truncate
    96 #define QT_FTRUNCATE            ::ftruncate
    97 #define QT_LSEEK                ::lseek
    98 #endif
     78#define QT_USE_XOPEN_LFS_EXTENSIONS
     79#include "../common/posix/qplatformdefs.h"
    9980
    100 #ifdef QT_LARGEFILE_SUPPORT
    101 #define QT_FOPEN                ::fopen64
    102 #define QT_FSEEK                ::fseeko64
    103 #define QT_FTELL                ::ftello64
    104 #define QT_FGETPOS              ::fgetpos64
    105 #define QT_FSETPOS              ::fsetpos64
    106 #define QT_MMAP                 ::mmap64
    107 #define QT_FPOS_T               fpos64_t
    108 #define QT_OFF_T                off64_t
    109 #else
    110 #define QT_FOPEN                ::fopen
    111 #define QT_FSEEK                ::fseek
    112 #define QT_FTELL                ::ftell
    113 #define QT_FGETPOS              ::fgetpos
    114 #define QT_FSETPOS              ::fsetpos
    115 #define QT_MMAP                 ::mmap
    116 #define QT_FPOS_T               fpos_t
    117 #define QT_OFF_T                long
    118 #endif
    119 
    120 #define QT_STAT_REG             S_IFREG
    121 #define QT_STAT_DIR             S_IFDIR
    122 #define QT_STAT_MASK            S_IFMT
    123 #define QT_STAT_LNK             S_IFLNK
    124 #define QT_SOCKET_CONNECT       ::connect
    125 #define QT_SOCKET_BIND          ::bind
    126 #define QT_FILENO               fileno
    127 #define QT_CLOSE                ::close
    128 #define QT_READ                 ::read
    129 #define QT_WRITE                ::write
    130 #define QT_ACCESS               ::access
    131 #define QT_GETCWD               ::getcwd
    132 #define QT_CHDIR                ::chdir
    133 #define QT_MKDIR                ::mkdir
    134 #define QT_RMDIR                ::rmdir
    135 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    136 #define QT_OPEN_RDONLY          O_RDONLY
    137 #define QT_OPEN_WRONLY          O_WRONLY
    138 #define QT_OPEN_RDWR            O_RDWR
    139 #define QT_OPEN_CREAT           O_CREAT
    140 #define QT_OPEN_TRUNC           O_TRUNC
    141 #define QT_OPEN_APPEND          O_APPEND
    142 
    143 #define QT_SIGNAL_RETTYPE       void
    144 #define QT_SIGNAL_ARGS          int
    145 #define QT_SIGNAL_IGNORE        SIG_IGN
     81#undef QT_SOCKLEN_T
    14682
    14783#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500)
    148 #define QT_SOCKLEN_T            size_t
     84#define QT_SOCKLEN_T            size_t
    14985#else
    150 #define QT_SOCKLEN_T            int
     86#define QT_SOCKLEN_T            int
    15187#endif
    15288
    … …  
    15793#endif
    15894
    159 
    16095#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/irix-g++-64/qmake.conf

    r2 r846  
    44
    55MAKEFILE_GENERATOR      = UNIX
     6TARGET_PLATFORM         = unix
    67TEMPLATE                = app
    78CONFIG                  += qt warn_on release link_prl
    … …  
    5859QMAKE_LFLAGS_THREAD     =
    5960QMAKE_LFLAGS_NOUNDEF    = -Wl,-no_unresolved
    60 QMAKE_RPATH             = -Wl,-rpath,
     61QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
    6162
    6263QMAKE_LIBS              = -lC

  • trunk/mkspecs/irix-g++-64/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)

  • trunk/mkspecs/irix-g++/qmake.conf

    r2 r846  
    44
    55MAKEFILE_GENERATOR      = UNIX
     6TARGET_PLATFORM         = unix
    67TEMPLATE                = app
    78CONFIG                  += qt warn_on release link_prl
    … …  
    5859QMAKE_LFLAGS_THREAD     =
    5960QMAKE_LFLAGS_NOUNDEF    = -Wl,-no_unresolved
    60 QMAKE_RPATH             = -Wl,-rpath,
     61QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
    6162
    6263QMAKE_LIBS              = -lC

  • trunk/mkspecs/irix-g++/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)
    … …  
    7676#endif
    7777
    78 #ifdef QT_LARGEFILE_SUPPORT
    79 #define QT_STATBUF              struct stat64
    80 #define QT_STATBUF4TSTAT        struct stat64
    81 #define QT_STAT                 ::stat64
    82 #define QT_FSTAT                ::fstat64
    83 #define QT_LSTAT                ::lstat64
    84 #define QT_OPEN                 ::open64
    85 #define QT_TRUNCATE             ::truncate64
    86 #define QT_FTRUNCATE            ::ftruncate64
    87 #define QT_LSEEK                ::lseek64
     78#define QT_USE_XOPEN_LFS_EXTENSIONS
     79#include "../common/posix/qplatformdefs.h"
     80
     81#undef QT_SOCKLEN_T
     82#undef QT_SIGNAL_ARGS
     83
     84#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500)
     85#define QT_SOCKLEN_T            size_t
    8886#else
    89 #define QT_STATBUF              struct stat
    90 #define QT_STATBUF4TSTAT        struct stat
    91 #define QT_STAT                 ::stat
    92 #define QT_FSTAT                ::fstat
    93 #define QT_LSTAT                ::lstat
    94 #define QT_OPEN                 ::open
    95 #define QT_TRUNCATE             ::truncate
    96 #define QT_FTRUNCATE            ::ftruncate
    97 #define QT_LSEEK                ::lseek
     87#define QT_SOCKLEN_T            int
    9888#endif
    9989
    100 #ifdef QT_LARGEFILE_SUPPORT
    101 #define QT_FOPEN                ::fopen64
    102 #define QT_FSEEK                ::fseeko64
    103 #define QT_FTELL                ::ftello64
    104 #define QT_FGETPOS              ::fgetpos64
    105 #define QT_FSETPOS              ::fsetpos64
    106 #define QT_MMAP                 ::mmap64
    107 #define QT_FPOS_T               fpos64_t
    108 #define QT_OFF_T                off64_t
     90#if defined(_LANGUAGE_C_PLUS_PLUS) || !defined(_SGIAPI)
     91#define QT_SIGNAL_ARGS          int
    10992#else
    110 #define QT_FOPEN                ::fopen
    111 #define QT_FSEEK                ::fseek
    112 #define QT_FTELL                ::ftell
    113 #define QT_FGETPOS              ::fgetpos
    114 #define QT_FSETPOS              ::fsetpos
    115 #define QT_MMAP                 ::mmap
    116 #define QT_FPOS_T               fpos_t
    117 #define QT_OFF_T                long
    118 #endif
    119 
    120 #define QT_STAT_REG             S_IFREG
    121 #define QT_STAT_DIR             S_IFDIR
    122 #define QT_STAT_MASK            S_IFMT
    123 #define QT_STAT_LNK             S_IFLNK
    124 #define QT_SOCKET_CONNECT       ::connect
    125 #define QT_SOCKET_BIND          ::bind
    126 #define QT_FILENO               fileno
    127 #define QT_CLOSE                ::close
    128 #define QT_READ                 ::read
    129 #define QT_WRITE                ::write
    130 #define QT_ACCESS               ::access
    131 #define QT_GETCWD               ::getcwd
    132 #define QT_CHDIR                ::chdir
    133 #define QT_MKDIR                ::mkdir
    134 #define QT_RMDIR                ::rmdir
    135 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    136 #define QT_OPEN_RDONLY          O_RDONLY
    137 #define QT_OPEN_WRONLY          O_WRONLY
    138 #define QT_OPEN_RDWR            O_RDWR
    139 #define QT_OPEN_CREAT           O_CREAT
    140 #define QT_OPEN_TRUNC           O_TRUNC
    141 #define QT_OPEN_APPEND          O_APPEND
    142 
    143 #define QT_SIGNAL_RETTYPE       void
    144 #if defined(_LANGUAGE_C_PLUS_PLUS) || !defined(_SGIAPI)
    145 #define QT_SIGNAL_ARGS          int
    146 #else
    147 #define QT_SIGNAL_ARGS          void
    148 #endif
    149 #define QT_SIGNAL_IGNORE        SIG_IGN
    150 
    151 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500)
    152 #define QT_SOCKLEN_T            size_t
    153 #else
    154 #define QT_SOCKLEN_T            int
     93#define QT_SIGNAL_ARGS          void
    15594#endif
    15695
    … …  
    161100#endif
    162101
    163 
    164102#endif // QPLATFORMDEFS_H
    165 

  • trunk/mkspecs/linux-cxx/qmake.conf

    r2 r846  
    66
    77MAKEFILE_GENERATOR      = UNIX
     8TARGET_PLATFORM         = unix
    89TEMPLATE                = app
    910CONFIG                  += qt warn_on release link_prl

  • trunk/mkspecs/linux-cxx/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)
    … …  
    8383#endif
    8484
    85 #ifdef QT_LARGEFILE_SUPPORT
    86 #define QT_STATBUF              struct stat64
    87 #define QT_STATBUF4TSTAT        struct stat64
    88 #define QT_STAT                 ::stat64
    89 #define QT_FSTAT                ::fstat64
    90 #define QT_LSTAT                ::lstat64
    91 #define QT_OPEN                 ::open64
    92 #define QT_TRUNCATE             ::truncate64
    93 #define QT_FTRUNCATE            ::ftruncate64
    94 #define QT_LSEEK                ::lseek64
    95 #else
    96 #define QT_STATBUF              struct stat
    97 #define QT_STATBUF4TSTAT        struct stat
    98 #define QT_STAT                 ::stat
    99 #define QT_FSTAT                ::fstat
    100 #define QT_LSTAT                ::lstat
    101 #define QT_OPEN                 ::open
    102 #define QT_TRUNCATE             ::truncate
    103 #define QT_FTRUNCATE            ::ftruncate
    104 #define QT_LSEEK                ::lseek
    105 #endif
     85#define QT_USE_XOPEN_LFS_EXTENSIONS
     86#include "../common/posix/qplatformdefs.h"
    10687
    107 #ifdef QT_LARGEFILE_SUPPORT
    108 #define QT_FOPEN                ::fopen64
    109 #define QT_FSEEK                ::fseeko64
    110 #define QT_FTELL                ::ftello64
    111 #define QT_FGETPOS              ::fgetpos64
    112 #define QT_FSETPOS              ::fsetpos64
    113 #define QT_MMAP                 ::mmap64
    114 #define QT_FPOS_T               fpos64_t
    115 #define QT_OFF_T                off64_t
    116 #else
    117 #define QT_FOPEN                ::fopen
    118 #define QT_FSEEK                ::fseek
    119 #define QT_FTELL                ::ftell
    120 #define QT_FGETPOS              ::fgetpos
    121 #define QT_FSETPOS              ::fsetpos
    122 #define QT_MMAP                 ::mmap
    123 #define QT_FPOS_T               fpos_t
    124 #define QT_OFF_T                long
    125 #endif
    126 
    127 #define QT_STAT_REG             S_IFREG
    128 #define QT_STAT_DIR             S_IFDIR
    129 #define QT_STAT_MASK            S_IFMT
    130 #define QT_STAT_LNK             S_IFLNK
    131 #define QT_SOCKET_CONNECT       ::connect
    132 #define QT_SOCKET_BIND          ::bind
    133 #define QT_FILENO               fileno
    134 #define QT_CLOSE                ::close
    135 #define QT_READ                 ::read
    136 #define QT_WRITE                ::write
    137 #define QT_ACCESS               ::access
    138 #define QT_GETCWD               ::getcwd
    139 #define QT_CHDIR                ::chdir
    140 #define QT_MKDIR                ::mkdir
    141 #define QT_RMDIR                ::rmdir
    142 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    143 #define QT_OPEN_RDONLY          O_RDONLY
    144 #define QT_OPEN_WRONLY          O_WRONLY
    145 #define QT_OPEN_RDWR            O_RDWR
    146 #define QT_OPEN_CREAT           O_CREAT
    147 #define QT_OPEN_TRUNC           O_TRUNC
    148 #define QT_OPEN_APPEND          O_APPEND
    149 
    150 #define QT_SIGNAL_RETTYPE       void
    151 #define QT_SIGNAL_ARGS          int
    152 #define QT_SIGNAL_IGNORE        SIG_IGN
     88#undef QT_SOCKLEN_T
    15389
    15490#if defined(__GLIBC__) && (__GLIBC__ >= 2)
    155 #define QT_SOCKLEN_T            socklen_t
     91#define QT_SOCKLEN_T            socklen_t
    15692#else
    157 #define QT_SOCKLEN_T            int
     93#define QT_SOCKLEN_T            int
    15894#endif
    15995
    … …  
    16399#endif
    164100
    165 
    166101#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/linux-ecc-64/qmake.conf

    r2 r846  
    66
    77MAKEFILE_GENERATOR      = UNIX
     8TARGET_PLATFORM         = unix
    89TEMPLATE                = app
    910CONFIG                  += qt warn_on release link_prl
    … …  
    5657QMAKE_LFLAGS_SONAME     = -Qoption,ld,-soname,
    5758QMAKE_LFLAGS_THREAD     =
    58 QMAKE_RPATH             = -Qoption,ld,-rpath,
     59QMAKE_LFLAGS_RPATH      = -Qoption,ld,-rpath,
    5960
    6061QMAKE_LIBS              =

  • trunk/mkspecs/linux-ecc-64/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)
    … …  
    8383#endif
    8484
    85 #ifdef QT_LARGEFILE_SUPPORT
    86 #define QT_STATBUF              struct stat64
    87 #define QT_STATBUF4TSTAT        struct stat64
    88 #define QT_STAT                 ::stat64
    89 #define QT_FSTAT                ::fstat64
    90 #define QT_LSTAT                ::lstat64
    91 #define QT_OPEN                 ::open64
    92 #define QT_TRUNCATE             ::truncate64
    93 #define QT_FTRUNCATE            ::ftruncate64
    94 #define QT_LSEEK                ::lseek64
    95 #else
    96 #define QT_STATBUF              struct stat
    97 #define QT_STATBUF4TSTAT        struct stat
    98 #define QT_STAT                 ::stat
    99 #define QT_FSTAT                ::fstat
    100 #define QT_LSTAT                ::lstat
    101 #define QT_OPEN                 ::open
    102 #define QT_TRUNCATE             ::truncate
    103 #define QT_FTRUNCATE            ::ftruncate
    104 #define QT_LSEEK                ::lseek
    105 #endif
     85#define QT_USE_XOPEN_LFS_EXTENSIONS
     86#include "../common/posix/qplatformdefs.h"
    10687
    107 #ifdef QT_LARGEFILE_SUPPORT
    108 #define QT_FOPEN                ::fopen64
    109 #define QT_FSEEK                ::fseeko64
    110 #define QT_FTELL                ::ftello64
    111 #define QT_FGETPOS              ::fgetpos64
    112 #define QT_FSETPOS              ::fsetpos64
    113 #define QT_MMAP                 ::mmap64
    114 #define QT_FPOS_T               fpos64_t
    115 #define QT_OFF_T                off64_t
    116 #else
    117 #define QT_FOPEN                ::fopen
    118 #define QT_FSEEK                ::fseek
    119 #define QT_FTELL                ::ftell
    120 #define QT_FGETPOS              ::fgetpos
    121 #define QT_FSETPOS              ::fsetpos
    122 #define QT_MMAP                 ::mmap
    123 #define QT_FPOS_T               fpos_t
    124 #define QT_OFF_T                long
    125 #endif
    126 
    127 #define QT_STAT_REG             S_IFREG
    128 #define QT_STAT_DIR             S_IFDIR
    129 #define QT_STAT_MASK            S_IFMT
    130 #define QT_STAT_LNK             S_IFLNK
    131 #define QT_SOCKET_CONNECT       ::connect
    132 #define QT_SOCKET_BIND          ::bind
    133 #define QT_FILENO               fileno
    134 #define QT_CLOSE                ::close
    135 #define QT_READ                 ::read
    136 #define QT_WRITE                ::write
    137 #define QT_ACCESS               ::access
    138 #define QT_GETCWD               ::getcwd
    139 #define QT_CHDIR                ::chdir
    140 #define QT_MKDIR                ::mkdir
    141 #define QT_RMDIR                ::rmdir
    142 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    143 #define QT_OPEN_RDONLY          O_RDONLY
    144 #define QT_OPEN_WRONLY          O_WRONLY
    145 #define QT_OPEN_RDWR            O_RDWR
    146 #define QT_OPEN_CREAT           O_CREAT
    147 #define QT_OPEN_TRUNC           O_TRUNC
    148 #define QT_OPEN_APPEND          O_APPEND
    149 
    150 #define QT_SIGNAL_RETTYPE       void
    151 #define QT_SIGNAL_ARGS          int
    152 #define QT_SIGNAL_IGNORE        SIG_IGN
     88#undef QT_SOCKLEN_T
    15389
    15490#if defined(__GLIBC__) && (__GLIBC__ >= 2)
    155 #define QT_SOCKLEN_T            socklen_t
     91#define QT_SOCKLEN_T            socklen_t
    15692#else
    157 #define QT_SOCKLEN_T            int
     93#define QT_SOCKLEN_T            int
    15894#endif
    15995
    … …  
    16399#endif
    164100
    165 
    166101#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/linux-g++-32/qmake.conf

    r2 r846  
    44
    55MAKEFILE_GENERATOR      = UNIX
     6TARGET_PLATFORM         = unix
    67TEMPLATE                = app
    78CONFIG                  += qt warn_on release incremental link_prl

  • trunk/mkspecs/linux-g++-32/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)

  • trunk/mkspecs/linux-g++-64/qmake.conf

    r2 r846  
    77
    88MAKEFILE_GENERATOR      = UNIX
     9TARGET_PLATFORM         = unix
    910TEMPLATE                = app
    1011CONFIG                  += qt warn_on release incremental link_prl

  • trunk/mkspecs/linux-g++-64/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)

  • trunk/mkspecs/linux-g++-maemo/qmake.conf

    r651 r846  
    44
    55MAKEFILE_GENERATOR      = UNIX
     6TARGET_PLATFORM         = unix
    67TEMPLATE                = app
    78CONFIG                 += qt warn_on release incremental link_prl
    … …  
    1314include(../common/linux.conf)
    1415
    15 # Work round scratchbox not having standard paths in it's default search path
    16 QMAKE_LFLAGS    += -Wl,-rpath-link=/lib
    17 QMAKE_LFLAGS    += -Wl,-rpath-link=/usr/lib
    1816
    1917# Override the default lib/include directories for scratchbox:
    … …  
    2422
    2523# We still need to generate debug symbols in release mode to put into the *-dbg packages:
    26 QMAKE_CFLAGS_RELEASE    += -g -fno-omit-frame-pointer -fno-optimize-sibling-calls
    27 QMAKE_CXXFLAGS_RELEASE  += -g -fno-omit-frame-pointer -fno-optimize-sibling-calls
    28 
    29 # Work round PowerVR SGX 1.3 driver bug with glScissor & FBOs:
    30 DEFINES += QT_GL_NO_SCISSOR_TEST
    31 
    32 # Work round SGX 1.4 driver bug (text corrupted), modify glyph cache width:
    33 DEFINES += QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH=1024
     24QMAKE_CFLAGS_RELEASE    += -g -Wno-psabi
     25QMAKE_CXXFLAGS_RELEASE  += -g -Wno-psabi
    3426
    3527load(qt_config)

  • trunk/mkspecs/linux-g++-maemo/qplatformdefs.h

    r769 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)
    … …  
    4343
    4444#define QT_GUI_DOUBLE_CLICK_RADIUS 20
     45#define QT_GUI_DRAG_DISTANCE 16

  • trunk/mkspecs/linux-g++/qmake.conf

    r2 r846  
    44
    55MAKEFILE_GENERATOR      = UNIX
     6TARGET_PLATFORM         = unix
    67TEMPLATE                = app
    78CONFIG                  += qt warn_on release incremental link_prl

  • trunk/mkspecs/linux-g++/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)
    … …  
    8282#endif
    8383
    84 #ifdef QT_LARGEFILE_SUPPORT
    85 #define QT_STATBUF              struct stat64
    86 #define QT_STATBUF4TSTAT        struct stat64
    87 #define QT_STAT                 ::stat64
    88 #define QT_FSTAT                ::fstat64
    89 #define QT_LSTAT                ::lstat64
    90 #define QT_OPEN                 ::open64
    91 #define QT_TRUNCATE             ::truncate64
    92 #define QT_FTRUNCATE            ::ftruncate64
    93 #define QT_LSEEK                ::lseek64
    94 #else
    95 #define QT_STATBUF              struct stat
    96 #define QT_STATBUF4TSTAT        struct stat
    97 #define QT_STAT                 ::stat
    98 #define QT_FSTAT                ::fstat
    99 #define QT_LSTAT                ::lstat
    100 #define QT_OPEN                 ::open
    101 #define QT_TRUNCATE             ::truncate
    102 #define QT_FTRUNCATE            ::ftruncate
    103 #define QT_LSEEK                ::lseek
    104 #endif
     84#define QT_USE_XOPEN_LFS_EXTENSIONS
     85#include "../common/posix/qplatformdefs.h"
    10586
    106 #ifdef QT_LARGEFILE_SUPPORT
    107 #define QT_FOPEN                ::fopen64
    108 #define QT_FSEEK                ::fseeko64
    109 #define QT_FTELL                ::ftello64
    110 #define QT_FGETPOS              ::fgetpos64
    111 #define QT_FSETPOS              ::fsetpos64
    112 #define QT_MMAP                 ::mmap64
    113 #define QT_FPOS_T               fpos64_t
    114 #define QT_OFF_T                off64_t
    115 #else
    116 #define QT_FOPEN                ::fopen
    117 #define QT_FSEEK                ::fseek
    118 #define QT_FTELL                ::ftell
    119 #define QT_FGETPOS              ::fgetpos
    120 #define QT_FSETPOS              ::fsetpos
    121 #define QT_MMAP                 ::mmap
    122 #define QT_FPOS_T               fpos_t
    123 #define QT_OFF_T                long
    124 #endif
    125 
    126 #define QT_STAT_REG             S_IFREG
    127 #define QT_STAT_DIR             S_IFDIR
    128 #define QT_STAT_MASK            S_IFMT
    129 #define QT_STAT_LNK             S_IFLNK
    130 #define QT_SOCKET_CONNECT       ::connect
    131 #define QT_SOCKET_BIND          ::bind
    132 #define QT_FILENO               fileno
    133 #define QT_CLOSE                ::close
    134 #define QT_READ                 ::read
    135 #define QT_WRITE                ::write
    136 #define QT_ACCESS               ::access
    137 #define QT_GETCWD               ::getcwd
    138 #define QT_CHDIR                ::chdir
    139 #define QT_MKDIR                ::mkdir
    140 #define QT_RMDIR                ::rmdir
    141 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    142 #define QT_OPEN_RDONLY          O_RDONLY
    143 #define QT_OPEN_WRONLY          O_WRONLY
    144 #define QT_OPEN_RDWR            O_RDWR
    145 #define QT_OPEN_CREAT           O_CREAT
    146 #define QT_OPEN_TRUNC           O_TRUNC
    147 #define QT_OPEN_APPEND          O_APPEND
    148 
    149 #define QT_SIGNAL_RETTYPE       void
    150 #define QT_SIGNAL_ARGS          int
    151 #define QT_SIGNAL_IGNORE        SIG_IGN
     87#undef QT_SOCKLEN_T
    15288
    15389#if defined(__GLIBC__) && (__GLIBC__ >= 2)
    154 #define QT_SOCKLEN_T            socklen_t
     90#define QT_SOCKLEN_T            socklen_t
    15591#else
    156 #define QT_SOCKLEN_T            int
     92#define QT_SOCKLEN_T            int
    15793#endif
    15894
    … …  
    16298#endif
    16399
    164 
    165100#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/linux-icc-32/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)

  • trunk/mkspecs/linux-icc-64/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)

  • trunk/mkspecs/linux-icc/qmake.conf

    r2 r846  
    1212
    1313MAKEFILE_GENERATOR      = UNIX
     14TARGET_PLATFORM         = unix
    1415TEMPLATE                = app
    1516CONFIG                  += qt warn_on release link_prl
    … …  
    2122QMAKE_YACC              = yacc
    2223QMAKE_YACCFLAGS         = -d
    23 QMAKE_CFLAGS            = -wd654,1572
     24QMAKE_CFLAGS            = -falign-stack=maintain-16-byte
    2425QMAKE_CFLAGS_DEPS       = -M
    25 QMAKE_CFLAGS_WARN_ON    =
     26QMAKE_CFLAGS_WARN_ON    = -w1 -Wcheck -wd654,1572,411,873,1125,2259
    2627QMAKE_CFLAGS_WARN_OFF   = -w
    27 QMAKE_CFLAGS_RELEASE    = -O2
    28 QMAKE_CFLAGS_DEBUG      = -g
    29 QMAKE_CFLAGS_SHLIB      = -fPIC
     28QMAKE_CFLAGS_RELEASE    = -O2 -falign-functions=16 -ansi-alias -fstrict-aliasing
     29QMAKE_CFLAGS_DEBUG      = -O0 -g
     30QMAKE_CFLAGS_SHLIB      = -fPIC -fno-jump-tables
    3031QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
    3132QMAKE_CFLAGS_YACC       =
    … …  
    5859QMAKE_LFLAGS_RELEASE    =
    5960QMAKE_LFLAGS_DEBUG      =
    60 QMAKE_LFLAGS_SHLIB      = -shared
     61QMAKE_LFLAGS_SHLIB      = -shared -shared-intel
    6162QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
    62 QMAKE_LFLAGS_SONAME     = -Qoption,ld,-soname,
     63QMAKE_LFLAGS_SONAME     = -Wl,-soname,
    6364QMAKE_LFLAGS_THREAD     =
    64 QMAKE_RPATH             = -Qoption,ld,-rpath,
     65QMAKE_LFLAGS_NOUNDEF    = -Wl,-z,defs
     66QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
    6567
    6668QMAKE_LIBS              =
    … …  
    7678QMAKE_UIC               = $$[QT_INSTALL_BINS]/uic
    7779
    78 QMAKE_AR                = ar cqs
     80QMAKE_AR                = xiar cqs
    7981QMAKE_OBJCOPY           = objcopy
    8082QMAKE_RANLIB            =
    … …  
    99101
    100102# -Bsymbolic-functions (ld) support
    101 QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Qoption,ld,-Bsymbolic-functions
    102 QMAKE_LFLAGS_DYNAMIC_LIST = -Qoption,ld,--dynamic-list,
     103QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
     104QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
    103105
    104106# Symbol visibility control

  • trunk/mkspecs/linux-icc/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)

  • trunk/mkspecs/linux-kcc/qmake.conf

    r2 r846  
    1515
    1616MAKEFILE_GENERATOR      = UNIX
     17TARGET_PLATFORM         = unix
    1718TEMPLATE                = app
    1819CONFIG                  += qt warn_on release link_prl
    … …  
    6566QMAKE_LFLAGS_SONAME     = --soname$$LITERAL_WHITESPACE
    6667QMAKE_LFLAGS_THREAD     = --thread_safe
    67 QMAKE_RPATH             = -rpath$$LITERAL_WHITESPACE
     68QMAKE_LFLAGS_RPATH      = -rpath$$LITERAL_WHITESPACE
    6869
    6970QMAKE_LIBS              =

  • trunk/mkspecs/linux-kcc/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)
    … …  
    8686#endif
    8787
    88 #ifdef QT_LARGEFILE_SUPPORT
    89 #define QT_STATBUF              struct stat64
    90 #define QT_STATBUF4TSTAT        struct stat64
    91 #define QT_STAT                 ::stat64
    92 #define QT_FSTAT                ::fstat64
    93 #define QT_LSTAT                ::lstat64
    94 #define QT_OPEN                 ::open64
    95 #define QT_TRUNCATE             ::truncate64
    96 #define QT_FTRUNCATE            ::ftruncate64
    97 #define QT_LSEEK                ::lseek64
    98 #else
    99 #define QT_STATBUF              struct stat
    100 #define QT_STATBUF4TSTAT        struct stat
    101 #define QT_STAT                 ::stat
    102 #define QT_FSTAT                ::fstat
    103 #define QT_LSTAT                ::lstat
    104 #define QT_OPEN                 ::open
    105 #define QT_TRUNCATE             ::truncate
    106 #define QT_FTRUNCATE            ::ftruncate
    107 #define QT_LSEEK                ::lseek
    108 #endif
     88#define QT_USE_XOPEN_LFS_EXTENSIONS
     89#include "../common/posix/qplatformdefs.h"
    10990
    110 #ifdef QT_LARGEFILE_SUPPORT
    111 #define QT_FOPEN                ::fopen64
    112 #define QT_FSEEK                ::fseeko64
    113 #define QT_FTELL                ::ftello64
    114 #define QT_FGETPOS              ::fgetpos64
    115 #define QT_FSETPOS              ::fsetpos64
    116 #define QT_MMAP                 ::mmap64
    117 #define QT_FPOS_T               fpos64_t
    118 #define QT_OFF_T                off64_t
    119 #else
    120 #define QT_FOPEN                ::fopen
    121 #define QT_FSEEK                ::fseek
    122 #define QT_FTELL                ::ftell
    123 #define QT_FGETPOS              ::fgetpos
    124 #define QT_FSETPOS              ::fsetpos
    125 #define QT_MMAP                 ::mmap
    126 #define QT_FPOS_T               fpos_t
    127 #define QT_OFF_T                long
    128 #endif
    129 
    130 #define QT_STAT_REG             S_IFREG
    131 #define QT_STAT_DIR             S_IFDIR
    132 #define QT_STAT_MASK            S_IFMT
    133 #define QT_STAT_LNK             S_IFLNK
    134 #define QT_SOCKET_CONNECT       ::connect
    135 #define QT_SOCKET_BIND          ::bind
    136 #define QT_FILENO               fileno
    137 #define QT_CLOSE                ::close
    138 #define QT_READ                 ::read
    139 #define QT_WRITE                ::write
    140 #define QT_ACCESS               ::access
    141 #define QT_GETCWD               ::getcwd
    142 #define QT_CHDIR                ::chdir
    143 #define QT_MKDIR                ::mkdir
    144 #define QT_RMDIR                ::rmdir
    145 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    146 #define QT_OPEN_RDONLY          O_RDONLY
    147 #define QT_OPEN_WRONLY          O_WRONLY
    148 #define QT_OPEN_RDWR            O_RDWR
    149 #define QT_OPEN_CREAT           O_CREAT
    150 #define QT_OPEN_TRUNC           O_TRUNC
    151 #define QT_OPEN_APPEND          O_APPEND
    152 
    153 #define QT_SIGNAL_RETTYPE       void
    154 #define QT_SIGNAL_ARGS          int
    155 #define QT_SIGNAL_IGNORE        SIG_IGN
     91#undef QT_SOCKLEN_T
    15692
    15793#if defined(__GLIBC__) && (__GLIBC__ >= 2)
    158 #define QT_SOCKLEN_T            socklen_t
     94#define QT_SOCKLEN_T            socklen_t
    15995#else
    160 #define QT_SOCKLEN_T            int
     96#define QT_SOCKLEN_T            int
    16197#endif
    16298
    … …  
    166102#endif
    167103
    168 
    169104#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/linux-llvm/qmake.conf

    r2 r846  
    44
    55MAKEFILE_GENERATOR      = UNIX
     6TARGET_PLATFORM         = unix
    67TEMPLATE                = app
    78CONFIG                  += qt warn_on release incremental link_prl

  • trunk/mkspecs/linux-llvm/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)
    … …  
    8383#endif
    8484
    85 #ifdef QT_LARGEFILE_SUPPORT
    86 #define QT_STATBUF              struct stat64
    87 #define QT_STATBUF4TSTAT        struct stat64
    88 #define QT_STAT                 ::stat64
    89 #define QT_FSTAT                ::fstat64
    90 #define QT_LSTAT                ::lstat64
    91 #define QT_OPEN                 ::open64
    92 #define QT_TRUNCATE             ::truncate64
    93 #define QT_FTRUNCATE            ::ftruncate64
    94 #define QT_LSEEK                ::lseek64
    95 #else
    96 #define QT_STATBUF              struct stat
    97 #define QT_STATBUF4TSTAT        struct stat
    98 #define QT_STAT                 ::stat
    99 #define QT_FSTAT                ::fstat
    100 #define QT_LSTAT                ::lstat
    101 #define QT_OPEN                 ::open
    102 #define QT_TRUNCATE             ::truncate
    103 #define QT_FTRUNCATE            ::ftruncate
    104 #define QT_LSEEK                ::lseek
    105 #endif
     85#define QT_USE_XOPEN_LFS_EXTENSIONS
     86#include "../common/posix/qplatformdefs.h"
    10687
    107 #ifdef QT_LARGEFILE_SUPPORT
    108 #define QT_FOPEN                ::fopen64
    109 #define QT_FSEEK                ::fseeko64
    110 #define QT_FTELL                ::ftello64
    111 #define QT_FGETPOS              ::fgetpos64
    112 #define QT_FSETPOS              ::fsetpos64
    113 #define QT_MMAP                 ::mmap64
    114 #define QT_FPOS_T               fpos64_t
    115 #define QT_OFF_T                off64_t
    116 #else
    117 #define QT_FOPEN                ::fopen
    118 #define QT_FSEEK                ::fseek
    119 #define QT_FTELL                ::ftell
    120 #define QT_FGETPOS              ::fgetpos
    121 #define QT_FSETPOS              ::fsetpos
    122 #define QT_MMAP                 ::mmap
    123 #define QT_FPOS_T               fpos_t
    124 #define QT_OFF_T                long
    125 #endif
    126 
    127 #define QT_STAT_REG             S_IFREG
    128 #define QT_STAT_DIR             S_IFDIR
    129 #define QT_STAT_MASK            S_IFMT
    130 #define QT_STAT_LNK             S_IFLNK
    131 #define QT_SOCKET_CONNECT       ::connect
    132 #define QT_SOCKET_BIND          ::bind
    133 #define QT_FILENO               fileno
    134 #define QT_CLOSE                ::close
    135 #define QT_READ                 ::read
    136 #define QT_WRITE                ::write
    137 #define QT_ACCESS               ::access
    138 #define QT_GETCWD               ::getcwd
    139 #define QT_CHDIR                ::chdir
    140 #define QT_MKDIR                ::mkdir
    141 #define QT_RMDIR                ::rmdir
    142 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    143 #define QT_OPEN_RDONLY          O_RDONLY
    144 #define QT_OPEN_WRONLY          O_WRONLY
    145 #define QT_OPEN_RDWR            O_RDWR
    146 #define QT_OPEN_CREAT           O_CREAT
    147 #define QT_OPEN_TRUNC           O_TRUNC
    148 #define QT_OPEN_APPEND          O_APPEND
    149 
    150 #define QT_SIGNAL_RETTYPE       void
    151 #define QT_SIGNAL_ARGS          int
    152 #define QT_SIGNAL_IGNORE        SIG_IGN
     88#undef QT_SOCKLEN_T
    15389
    15490#if defined(__GLIBC__) && (__GLIBC__ >= 2)
    155 #define QT_SOCKLEN_T            socklen_t
     91#define QT_SOCKLEN_T            socklen_t
    15692#else
    157 #define QT_SOCKLEN_T            int
     93#define QT_SOCKLEN_T            int
    15894#endif
    15995
    … …  
    16399#endif
    164100
    165 
    166101#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/linux-lsb-g++/qmake.conf

    r2 r846  
    44
    55MAKEFILE_GENERATOR      = UNIX
     6TARGET_PLATFORM         = unix
    67TEMPLATE                = app
    78CONFIG                  += qt warn_on release incremental link_prl
    … …  
    6263QMAKE_LFLAGS_SONAME     = -Wl,-soname,
    6364QMAKE_LFLAGS_THREAD     =
    64 QMAKE_RPATH             = -Wl,-rpath,
     65QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
    6566
    6667QMAKE_LIBS              =

  • trunk/mkspecs/linux-lsb-g++/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)
    … …  
    8787#include <arpa/inet.h>
    8888
    89 #ifdef QT_LARGEFILE_SUPPORT
    90 #define QT_STATBUF              struct stat64
    91 #define QT_STATBUF4TSTAT        struct stat64
    92 #define QT_STAT                 ::stat64
    93 #define QT_FSTAT                ::fstat64
    94 #define QT_LSTAT                ::lstat64
    95 #define QT_OPEN                 ::open64
    96 #define QT_TRUNCATE             ::truncate64
    97 #define QT_FTRUNCATE            ::ftruncate64
    98 #define QT_LSEEK                ::lseek64
     89#define QT_USE_XOPEN_LFS_EXTENSIONS
     90#include "../common/posix/qplatformdefs.h"
     91
     92#undef QT_OPEN_LARGEFILE
     93#undef QT_SOCKLEN_T
     94
     95#define QT_OPEN_LARGEFILE       0
     96
     97#if defined(__GLIBC__) && (__GLIBC__ >= 2)
     98#define QT_SOCKLEN_T            socklen_t
    9999#else
    100 #define QT_STATBUF              struct stat
    101 #define QT_STATBUF4TSTAT        struct stat
    102 #define QT_STAT                 ::stat
    103 #define QT_FSTAT                ::fstat
    104 #define QT_LSTAT                ::lstat
    105 #define QT_OPEN                 ::open
    106 #define QT_TRUNCATE             ::truncate
    107 #define QT_FTRUNCATE            ::ftruncate
    108 #define QT_LSEEK                ::lseek
     100#define QT_SOCKLEN_T            int
    109101#endif
    110 
    111 #ifdef QT_LARGEFILE_SUPPORT
    112 #define QT_FOPEN                ::fopen64
    113 #define QT_FSEEK                ::fseeko64
    114 #define QT_FTELL                ::ftello64
    115 #define QT_FGETPOS              ::fgetpos64
    116 #define QT_FSETPOS              ::fsetpos64
    117 #define QT_MMAP                 ::mmap64
    118 #define QT_FPOS_T               fpos64_t
    119 #define QT_OFF_T                off64_t
    120 #else
    121 #define QT_FOPEN                ::fopen
    122 #define QT_FSEEK                ::fseek
    123 #define QT_FTELL                ::ftell
    124 #define QT_FGETPOS              ::fgetpos
    125 #define QT_FSETPOS              ::fsetpos
    126 #define QT_MMAP                 ::mmap
    127 #define QT_FPOS_T               fpos_t
    128 #define QT_OFF_T                long
    129 #endif
    130 
    131 #define QT_STAT_REG             S_IFREG
    132 #define QT_STAT_DIR             S_IFDIR
    133 #define QT_STAT_MASK            S_IFMT
    134 #define QT_STAT_LNK             S_IFLNK
    135 #define QT_SOCKET_CONNECT       ::connect
    136 #define QT_SOCKET_BIND          ::bind
    137 #define QT_SOCKET_BIND          ::bind
    138 #define QT_FILENO               fileno
    139 #define QT_CLOSE                ::close
    140 #define QT_READ                 ::read
    141 #define QT_WRITE                ::write
    142 #define QT_ACCESS               ::access
    143 #define QT_GETCWD               ::getcwd
    144 #define QT_CHDIR                ::chdir
    145 #define QT_MKDIR                ::mkdir
    146 #define QT_RMDIR                ::rmdir
    147 #define QT_OPEN_LARGEFILE       0
    148 #define QT_OPEN_RDONLY          O_RDONLY
    149 #define QT_OPEN_WRONLY          O_WRONLY
    150 #define QT_OPEN_RDWR            O_RDWR
    151 #define QT_OPEN_CREAT           O_CREAT
    152 #define QT_OPEN_TRUNC           O_TRUNC
    153 #define QT_OPEN_APPEND          O_APPEND
    154 
    155 #define QT_SIGNAL_RETTYPE       void
    156 #define QT_SIGNAL_ARGS          int
    157 #define QT_SIGNAL_IGNORE        SIG_IGN
    158102
    159103#ifndef SIOCGIFBRDADDR
    160104#  define SIOCGIFBRDADDR 0x8919
    161 #endif
    162 
    163 #if defined(__GLIBC__) && (__GLIBC__ >= 2)
    164 #define QT_SOCKLEN_T            socklen_t
    165 #else
    166 #define QT_SOCKLEN_T            int
    167105#endif
    168106
    … …  
    172110#endif
    173111
    174 
    175112#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/linux-pgcc/qmake.conf

    r2 r846  
    66
    77MAKEFILE_GENERATOR      = UNIX
     8TARGET_PLATFORM         = unix
    89TEMPLATE                = app
    910CONFIG                  += qt warn_on release link_prl
    … …  
    5657QMAKE_LFLAGS_SONAME     = -Wl,-soname,
    5758QMAKE_LFLAGS_THREAD     =
    58 QMAKE_RPATH             = -R
     59QMAKE_LFLAGS_RPATH      = -R
    5960
    6061QMAKE_LIBS              =

  • trunk/mkspecs/linux-pgcc/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)
    … …  
    8383#endif
    8484
    85 #ifdef QT_LARGEFILE_SUPPORT
    86 #define QT_STATBUF              struct stat64
    87 #define QT_STATBUF4TSTAT        struct stat64
    88 #define QT_STAT                 ::stat64
    89 #define QT_FSTAT                ::fstat64
    90 #define QT_LSTAT                ::lstat64
    91 #define QT_OPEN                 ::open64
    92 #define QT_TRUNCATE             ::truncate64
    93 #define QT_FTRUNCATE            ::ftruncate64
    94 #define QT_LSEEK                ::lseek64
    95 #else
    96 #define QT_STATBUF              struct stat
    97 #define QT_STATBUF4TSTAT        struct stat
    98 #define QT_STAT                 ::stat
    99 #define QT_FSTAT                ::fstat
    100 #define QT_LSTAT                ::lstat
    101 #define QT_OPEN                 ::open
    102 #define QT_TRUNCATE             ::truncate
    103 #define QT_FTRUNCATE            ::ftruncate
    104 #define QT_LSEEK                ::lseek
    105 #endif
     85#define QT_USE_XOPEN_LFS_EXTENSIONS
     86#include "../common/posix/qplatformdefs.h"
    10687
    107 #ifdef QT_LARGEFILE_SUPPORT
    108 #define QT_FOPEN                ::fopen64
    109 #define QT_FSEEK                ::fseeko64
    110 #define QT_FTELL                ::ftello64
    111 #define QT_FGETPOS              ::fgetpos64
    112 #define QT_FSETPOS              ::fsetpos64
    113 #define QT_MMAP                 ::mmap64
    114 #define QT_FPOS_T               fpos64_t
    115 #define QT_OFF_T                off64_t
    116 #else
    117 #define QT_FOPEN                ::fopen
    118 #define QT_FSEEK                ::fseek
    119 #define QT_FTELL                ::ftell
    120 #define QT_FGETPOS              ::fgetpos
    121 #define QT_FSETPOS              ::fsetpos
    122 #define QT_MMAP                 ::mmap
    123 #define QT_FPOS_T               fpos_t
    124 #define QT_OFF_T                long
    125 #endif
    126 
    127 #define QT_STAT_REG             S_IFREG
    128 #define QT_STAT_DIR             S_IFDIR
    129 #define QT_STAT_MASK            S_IFMT
    130 #define QT_STAT_LNK             S_IFLNK
    131 #define QT_SOCKET_CONNECT       ::connect
    132 #define QT_SOCKET_BIND          ::bind
    133 #define QT_FILENO               fileno
    134 #define QT_CLOSE                ::close
    135 #define QT_READ                 ::read
    136 #define QT_WRITE                ::write
    137 #define QT_ACCESS               ::access
    138 #define QT_GETCWD               ::getcwd
    139 #define QT_CHDIR                ::chdir
    140 #define QT_MKDIR                ::mkdir
    141 #define QT_RMDIR                ::rmdir
    142 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    143 #define QT_OPEN_RDONLY          O_RDONLY
    144 #define QT_OPEN_WRONLY          O_WRONLY
    145 #define QT_OPEN_RDWR            O_RDWR
    146 #define QT_OPEN_CREAT           O_CREAT
    147 #define QT_OPEN_TRUNC           O_TRUNC
    148 #define QT_OPEN_APPEND          O_APPEND
    149 
    150 #define QT_SIGNAL_RETTYPE       void
    151 #define QT_SIGNAL_ARGS          int
    152 #define QT_SIGNAL_IGNORE        SIG_IGN
     88#undef QT_SOCKLEN_T
    15389
    15490#if defined(__GLIBC__) && (__GLIBC__ >= 2)
    155 #define QT_SOCKLEN_T            socklen_t
     91#define QT_SOCKLEN_T            socklen_t
    15692#else
    157 #define QT_SOCKLEN_T            int
     93#define QT_SOCKLEN_T            int
    15894#endif
    15995
    … …  
    16399#endif
    164100
    165 
    166101#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/lynxos-g++/qmake.conf

    r2 r846  
    66
    77MAKEFILE_GENERATOR      = UNIX
     8TARGET_PLATFORM         = unix
    89TEMPLATE                = app
    910CONFIG                  += qt warn_on release incremental link_prl
    … …  
    5960QMAKE_LFLAGS_SONAME     = -Wl,-soname,
    6061QMAKE_LFLAGS_THREAD     =
    61 QMAKE_RPATH             = -Wl,-rpath,
     62QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
    6263
    6364QMAKE_LIBS              =

  • trunk/mkspecs/lynxos-g++/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)
    … …  
    7676#endif
    7777
    78 #define QT_FOPEN                ::fopen
    79 #define QT_FSEEK                ::fseeko
    80 #define QT_FTELL                ::ftello
    81 #define QT_FGETPOS              ::fgetpos
    82 #define QT_FSETPOS              ::fsetpos
    83 #define QT_MMAP                 ::mmap
    84 #define QT_FPOS_T               fpos_t
    85 #define QT_OFF_T                off_t
     78#include "../common/posix/qplatformdefs.h"
    8679
    87 #define QT_STATBUF              struct stat
    88 #define QT_STATBUF4TSTAT        struct stat
    89 #define QT_STAT                 ::stat
    90 #define QT_FSTAT                ::fstat
    91 #define QT_LSTAT                ::lstat
    92 #define QT_STAT_REG             S_IFREG
    93 #define QT_STAT_DIR             S_IFDIR
    94 #define QT_STAT_MASK            S_IFMT
    95 #define QT_STAT_LNK             S_IFLNK
    96 #define QT_SOCKET_CONNECT       ::connect
    97 #define QT_SOCKET_BIND          ::bind
    98 #define QT_FILENO               fileno
    99 #define QT_OPEN                 ::open
    100 #define QT_CLOSE                ::close
    101 #define QT_TRUNCATE             ::truncate
    102 #define QT_FTRUNCATE            ::ftruncate
    103 #define QT_LSEEK                ::lseek
    104 #define QT_READ                 ::read
    105 #define QT_WRITE                ::write
    106 #define QT_ACCESS               ::access
    107 #define QT_GETCWD               ::getcwd
    108 #define QT_CHDIR                ::chdir
    109 #define QT_MKDIR                ::mkdir
    110 #define QT_RMDIR                ::rmdir
    111 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    112 #define QT_OPEN_RDONLY          O_RDONLY
    113 #define QT_OPEN_WRONLY          O_WRONLY
    114 #define QT_OPEN_RDWR            O_RDWR
    115 #define QT_OPEN_CREAT           O_CREAT
    116 #define QT_OPEN_TRUNC           O_TRUNC
    117 #define QT_OPEN_APPEND          O_APPEND
    118 
    119 #define QT_SIGNAL_RETTYPE       void
    120 #define QT_SIGNAL_ARGS          void
    121 #define QT_SIGNAL_IGNORE        SIG_IGN
     80#undef QT_SOCKLEN_T
    12281
    12382#if defined(__GLIBC__) && (__GLIBC__ >= 2)
    124 #define QT_SOCKLEN_T            socklen_t
     83#define QT_SOCKLEN_T            socklen_t
    12584#else
    126 #define QT_SOCKLEN_T            int
     85#define QT_SOCKLEN_T            int
    12786#endif
    12887
    … …  
    13291#endif
    13392
    134 
    13593#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/macx-g++/qmake.conf

    r561 r846  
    88
    99MAKEFILE_GENERATOR      = UNIX
     10TARGET_PLATFORM         = macx
    1011TEMPLATE                = app
    1112CONFIG                  += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl

  • trunk/mkspecs/macx-g++/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)
    … …  
    7676#endif
    7777
    78 #define QT_FOPEN                ::fopen
    79 #define QT_FSEEK                ::fseeko
    80 #define QT_FTELL                ::ftello
    81 #define QT_FGETPOS              ::fgetpos
    82 #define QT_FSETPOS              ::fsetpos
    83 #define QT_MMAP                 ::mmap
    84 #define QT_FPOS_T               fpos_t
    85 #define QT_OFF_T                off_t
     78#include "../common/posix/qplatformdefs.h"
    8679
    87 #define QT_STATBUF              struct stat
    88 #define QT_STATBUF4TSTAT        struct stat
    89 #define QT_STAT                 ::stat
    90 #define QT_FSTAT                ::fstat
    91 #define QT_LSTAT                ::lstat
    92 #define QT_STAT_REG             S_IFREG
    93 #define QT_STAT_DIR             S_IFDIR
    94 #define QT_STAT_MASK            S_IFMT
    95 #define QT_STAT_LNK             S_IFLNK
    96 #define QT_SOCKET_CONNECT       ::connect
    97 #define QT_SOCKET_BIND          ::bind
    98 #define QT_FILENO               fileno
    99 #define QT_OPEN                 ::open
    100 #define QT_CLOSE                ::close
    101 #define QT_TRUNCATE             ::truncate
    102 #define QT_FTRUNCATE            ::ftruncate
    103 #define QT_LSEEK                ::lseek
    104 #define QT_READ                 ::read
    105 #define QT_WRITE                ::write
    106 #define QT_ACCESS               ::access
    107 #define QT_GETCWD               ::getcwd
    108 #define QT_CHDIR                ::chdir
    109 #define QT_MKDIR                ::mkdir
    110 #define QT_RMDIR                ::rmdir
     80#undef QT_OPEN_LARGEFILE
     81#undef QT_SOCKLEN_T
     82#undef QT_SIGNAL_IGNORE
     83
    11184#define QT_OPEN_LARGEFILE       0
    112 #define QT_OPEN_RDONLY          O_RDONLY
    113 #define QT_OPEN_WRONLY          O_WRONLY
    114 #define QT_OPEN_RDWR            O_RDWR
    115 #define QT_OPEN_CREAT           O_CREAT
    116 #define QT_OPEN_TRUNC           O_TRUNC
    117 #define QT_OPEN_APPEND          O_APPEND
    118 
    119 #define QT_SIGNAL_RETTYPE       void
    120 #define QT_SIGNAL_ARGS          int
    121 #define QT_SIGNAL_IGNORE        (void (*)(int))1
    12285
    12386#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4)
    124 #define QT_SOCKLEN_T            socklen_t
     87#define QT_SOCKLEN_T            socklen_t
    12588#else
    126 #define QT_SOCKLEN_T            int
     89#define QT_SOCKLEN_T            int
    12790#endif
     91
     92#define QT_SIGNAL_IGNORE        (void (*)(int))1
    12893
    12994#define QT_SNPRINTF             ::snprintf
    13095#define QT_VSNPRINTF            ::vsnprintf
    13196
    132 
    13397#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/macx-g++40/qmake.conf

    r561 r846  
    88
    99MAKEFILE_GENERATOR      = UNIX
     10TARGET_PLATFORM         = macx
    1011TEMPLATE                = app
    1112CONFIG                  += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl

  • trunk/mkspecs/macx-g++40/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)
    … …  
    7676#endif
    7777
    78 #define QT_FOPEN                ::fopen
    79 #define QT_FSEEK                ::fseeko
    80 #define QT_FTELL                ::ftello
    81 #define QT_FGETPOS              ::fgetpos
    82 #define QT_FSETPOS              ::fsetpos
    83 #define QT_MMAP                 ::mmap
    84 #define QT_FPOS_T               fpos_t
    85 #define QT_OFF_T                off_t
     78#include "../common/posix/qplatformdefs.h"
    8679
    87 #define QT_STATBUF              struct stat
    88 #define QT_STATBUF4TSTAT        struct stat
    89 #define QT_STAT                 ::stat
    90 #define QT_FSTAT                ::fstat
    91 #define QT_LSTAT                ::lstat
    92 #define QT_STAT_REG             S_IFREG
    93 #define QT_STAT_DIR             S_IFDIR
    94 #define QT_STAT_MASK            S_IFMT
    95 #define QT_STAT_LNK             S_IFLNK
    96 #define QT_SOCKET_CONNECT       ::connect
    97 #define QT_SOCKET_BIND          ::bind
    98 #define QT_FILENO               fileno
    99 #define QT_OPEN                 ::open
    100 #define QT_CLOSE                ::close
    101 #define QT_TRUNCATE             ::truncate
    102 #define QT_FTRUNCATE            ::ftruncate
    103 #define QT_LSEEK                ::lseek
    104 #define QT_READ                 ::read
    105 #define QT_WRITE                ::write
    106 #define QT_ACCESS               ::access
    107 #define QT_GETCWD               ::getcwd
    108 #define QT_CHDIR                ::chdir
    109 #define QT_MKDIR                ::mkdir
    110 #define QT_RMDIR                ::rmdir
     80#undef QT_OPEN_LARGEFILE
     81#undef QT_SOCKLEN_T
     82#undef QT_SIGNAL_IGNORE
     83
    11184#define QT_OPEN_LARGEFILE       0
    112 #define QT_OPEN_RDONLY          O_RDONLY
    113 #define QT_OPEN_WRONLY          O_WRONLY
    114 #define QT_OPEN_RDWR            O_RDWR
    115 #define QT_OPEN_CREAT           O_CREAT
    116 #define QT_OPEN_TRUNC           O_TRUNC
    117 #define QT_OPEN_APPEND          O_APPEND
    118 
    119 #define QT_SIGNAL_RETTYPE       void
    120 #define QT_SIGNAL_ARGS          int
    121 #define QT_SIGNAL_IGNORE        (void (*)(int))1
    12285
    12386#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4)
    124 #define QT_SOCKLEN_T            socklen_t
     87#define QT_SOCKLEN_T            socklen_t
    12588#else
    126 #define QT_SOCKLEN_T            int
     89#define QT_SOCKLEN_T            int
    12790#endif
     91
     92#define QT_SIGNAL_IGNORE        (void (*)(int))1
    12893
    12994#define QT_SNPRINTF             ::snprintf
    13095#define QT_VSNPRINTF            ::vsnprintf
    13196
    132 
    13397#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/macx-g++42/qmake.conf

    r561 r846  
    88
    99MAKEFILE_GENERATOR      = UNIX
     10TARGET_PLATFORM         = macx
    1011TEMPLATE                = app
    1112CONFIG                  += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl

  • trunk/mkspecs/macx-g++42/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)
    … …  
    7676#endif
    7777
    78 #define QT_FOPEN                ::fopen
    79 #define QT_FSEEK                ::fseeko
    80 #define QT_FTELL                ::ftello
    81 #define QT_FGETPOS              ::fgetpos
    82 #define QT_FSETPOS              ::fsetpos
    83 #define QT_MMAP                 ::mmap
    84 #define QT_FPOS_T               fpos_t
    85 #define QT_OFF_T                off_t
     78#include "../common/posix/qplatformdefs.h"
    8679
    87 #define QT_STATBUF              struct stat
    88 #define QT_STATBUF4TSTAT        struct stat
    89 #define QT_STAT                 ::stat
    90 #define QT_FSTAT                ::fstat
    91 #define QT_LSTAT                ::lstat
    92 #define QT_STAT_REG             S_IFREG
    93 #define QT_STAT_DIR             S_IFDIR
    94 #define QT_STAT_MASK            S_IFMT
    95 #define QT_STAT_LNK             S_IFLNK
    96 #define QT_SOCKET_CONNECT       ::connect
    97 #define QT_SOCKET_BIND          ::bind
    98 #define QT_FILENO               fileno
    99 #define QT_OPEN                 ::open
    100 #define QT_CLOSE                ::close
    101 #define QT_TRUNCATE             ::truncate
    102 #define QT_FTRUNCATE            ::ftruncate
    103 #define QT_LSEEK                ::lseek
    104 #define QT_READ                 ::read
    105 #define QT_WRITE                ::write
    106 #define QT_ACCESS               ::access
    107 #define QT_GETCWD               ::getcwd
    108 #define QT_CHDIR                ::chdir
    109 #define QT_MKDIR                ::mkdir
    110 #define QT_RMDIR                ::rmdir
     80#undef QT_OPEN_LARGEFILE
     81#undef QT_SOCKLEN_T
     82#undef QT_SIGNAL_IGNORE
     83
    11184#define QT_OPEN_LARGEFILE       0
    112 #define QT_OPEN_RDONLY          O_RDONLY
    113 #define QT_OPEN_WRONLY          O_WRONLY
    114 #define QT_OPEN_RDWR            O_RDWR
    115 #define QT_OPEN_CREAT           O_CREAT
    116 #define QT_OPEN_TRUNC           O_TRUNC
    117 #define QT_OPEN_APPEND          O_APPEND
    118 
    119 #define QT_SIGNAL_RETTYPE       void
    120 #define QT_SIGNAL_ARGS          int
    121 #define QT_SIGNAL_IGNORE        (void (*)(int))1
    12285
    12386#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4)
    124 #define QT_SOCKLEN_T            socklen_t
     87#define QT_SOCKLEN_T            socklen_t
    12588#else
    126 #define QT_SOCKLEN_T            int
     89#define QT_SOCKLEN_T            int
    12790#endif
     91
     92#define QT_SIGNAL_IGNORE        (void (*)(int))1
    12893
    12994#define QT_SNPRINTF             ::snprintf
    13095#define QT_VSNPRINTF            ::vsnprintf
    13196
    132 
    13397#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/macx-icc/qmake.conf

    r2 r846  
    1414
    1515MAKEFILE_GENERATOR      = UNIX
     16TARGET_PLATFORM         = macx
    1617TEMPLATE                = app
    1718CONFIG                  += qt warn_on release link_prl app_bundle
    … …  
    7071#QMAKE_LFLAGS_PPC        = -arch ppc
    7172#QMAKE_LFLAGS_X86        = -arch i386
    72 QMAKE_RPATH             =
     73QMAKE_LFLAGS_RPATH      =
    7374
    7475QMAKE_LFLAGS_VERSION    = -current_version$${LITERAL_WHITESPACE}

  • trunk/mkspecs/macx-icc/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)

  • trunk/mkspecs/macx-llvm/qmake.conf

    r561 r846  
    88
    99MAKEFILE_GENERATOR      = UNIX
     10TARGET_PLATFORM         = macx
    1011TEMPLATE                = app
    1112CONFIG                  += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl

  • trunk/mkspecs/macx-llvm/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)
    … …  
    7676#endif
    7777
    78 #define QT_FOPEN                ::fopen
    79 #define QT_FSEEK                ::fseeko
    80 #define QT_FTELL                ::ftello
    81 #define QT_FGETPOS              ::fgetpos
    82 #define QT_FSETPOS              ::fsetpos
    83 #define QT_MMAP                 ::mmap
    84 #define QT_FPOS_T               fpos_t
    85 #define QT_OFF_T                off_t
     78#include "../common/posix/qplatformdefs.h"
    8679
    87 #define QT_STATBUF              struct stat
    88 #define QT_STATBUF4TSTAT        struct stat
    89 #define QT_STAT                 ::stat
    90 #define QT_FSTAT                ::fstat
    91 #define QT_LSTAT                ::lstat
    92 #define QT_STAT_REG             S_IFREG
    93 #define QT_STAT_DIR             S_IFDIR
    94 #define QT_STAT_MASK            S_IFMT
    95 #define QT_STAT_LNK             S_IFLNK
    96 #define QT_SOCKET_CONNECT       ::connect
    97 #define QT_SOCKET_BIND          ::bind
    98 #define QT_FILENO               fileno
    99 #define QT_OPEN                 ::open
    100 #define QT_CLOSE                ::close
    101 #define QT_TRUNCATE             ::truncate
    102 #define QT_FTRUNCATE            ::ftruncate
    103 #define QT_LSEEK                ::lseek
    104 #define QT_READ                 ::read
    105 #define QT_WRITE                ::write
    106 #define QT_ACCESS               ::access
    107 #define QT_GETCWD               ::getcwd
    108 #define QT_CHDIR                ::chdir
    109 #define QT_MKDIR                ::mkdir
    110 #define QT_RMDIR                ::rmdir
     80#undef QT_OPEN_LARGEFILE
     81#undef QT_SOCKLEN_T
     82#undef QT_SIGNAL_IGNORE
     83
    11184#define QT_OPEN_LARGEFILE       0
    112 #define QT_OPEN_RDONLY          O_RDONLY
    113 #define QT_OPEN_WRONLY          O_WRONLY
    114 #define QT_OPEN_RDWR            O_RDWR
    115 #define QT_OPEN_CREAT           O_CREAT
    116 #define QT_OPEN_TRUNC           O_TRUNC
    117 #define QT_OPEN_APPEND          O_APPEND
    118 
    119 #define QT_SIGNAL_RETTYPE       void
    120 #define QT_SIGNAL_ARGS          int
    121 #define QT_SIGNAL_IGNORE        (void (*)(int))1
    12285
    12386#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4)
    124 #define QT_SOCKLEN_T            socklen_t
     87#define QT_SOCKLEN_T            socklen_t
    12588#else
    126 #define QT_SOCKLEN_T            int
     89#define QT_SOCKLEN_T            int
    12790#endif
     91
     92#define QT_SIGNAL_IGNORE        (void (*)(int))1
    12893
    12994#define QT_SNPRINTF             ::snprintf
    13095#define QT_VSNPRINTF            ::vsnprintf
    13196
    132 
    13397#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/macx-pbuilder/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)
    … …  
    7676#endif
    7777
    78 #define QT_FOPEN                ::fopen
    79 #define QT_FSEEK                ::fseeko
    80 #define QT_FTELL                ::ftello
    81 #define QT_FGETPOS              ::fgetpos
    82 #define QT_FSETPOS              ::fsetpos
    83 #define QT_MMAP                 ::mmap
    84 #define QT_FPOS_T               fpos_t
    85 #define QT_OFF_T                off_t
     78#include "../common/posix/qplatformdefs.h"
    8679
    87 #define QT_STATBUF              struct stat
    88 #define QT_STATBUF4TSTAT        struct stat
    89 #define QT_STAT                 ::stat
    90 #define QT_FSTAT                ::fstat
    91 #define QT_LSTAT                ::lstat
    92 #define QT_STAT_REG             S_IFREG
    93 #define QT_STAT_DIR             S_IFDIR
    94 #define QT_STAT_MASK            S_IFMT
    95 #define QT_STAT_LNK             S_IFLNK
    96 #define QT_SOCKET_CONNECT       ::connect
    97 #define QT_SOCKET_BIND          ::bind
    98 #define QT_FILENO               fileno
    99 #define QT_OPEN                 ::open
    100 #define QT_CLOSE                ::close
    101 #define QT_TRUNCATE             ::truncate
    102 #define QT_FTRUNCATE            ::ftruncate
    103 #define QT_LSEEK                ::lseek
    104 #define QT_READ                 ::read
    105 #define QT_WRITE                ::write
    106 #define QT_ACCESS               ::access
    107 #define QT_GETCWD               ::getcwd
    108 #define QT_CHDIR                ::chdir
    109 #define QT_MKDIR                ::mkdir
    110 #define QT_RMDIR                ::rmdir
    111 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    112 #define QT_OPEN_RDONLY          O_RDONLY
    113 #define QT_OPEN_WRONLY          O_WRONLY
    114 #define QT_OPEN_RDWR            O_RDWR
    115 #define QT_OPEN_CREAT           O_CREAT
    116 #define QT_OPEN_TRUNC           O_TRUNC
    117 #define QT_OPEN_APPEND          O_APPEND
    118 
    119 #define QT_SIGNAL_RETTYPE       void
    120 #define QT_SIGNAL_ARGS          int
    121 #define QT_SIGNAL_IGNORE        (void (*)(int))1
     80#undef QT_SOCKLEN_T
     81#undef QT_SIGNAL_IGNORE
    12282
    12383#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4)
    124 #define QT_SOCKLEN_T            socklen_t
     84#define QT_SOCKLEN_T            socklen_t
    12585#else
    126 #define QT_SOCKLEN_T            int
     86#define QT_SOCKLEN_T            int
    12787#endif
     88
     89#define QT_SIGNAL_IGNORE        (void (*)(int))1
    12890
    12991#define QT_SNPRINTF             ::snprintf
    13092#define QT_VSNPRINTF            ::vsnprintf
    13193
    132 
    13394#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/macx-xcode/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)
    … …  
    7676#endif
    7777
    78 #define QT_FOPEN                ::fopen
    79 #define QT_FSEEK                ::fseeko
    80 #define QT_FTELL                ::ftello
    81 #define QT_FGETPOS              ::fgetpos
    82 #define QT_FSETPOS              ::fsetpos
    83 #define QT_MMAP                 ::mmap
    84 #define QT_FPOS_T               fpos_t
    85 #define QT_OFF_T                off_t
     78#include "../common/posix/qplatformdefs.h"
    8679
    87 #define QT_STATBUF              struct stat
    88 #define QT_STATBUF4TSTAT        struct stat
    89 #define QT_STAT                 ::stat
    90 #define QT_FSTAT                ::fstat
    91 #define QT_LSTAT                ::lstat
    92 #define QT_STAT_REG             S_IFREG
    93 #define QT_STAT_DIR             S_IFDIR
    94 #define QT_STAT_MASK            S_IFMT
    95 #define QT_STAT_LNK             S_IFLNK
    96 #define QT_SOCKET_CONNECT       ::connect
    97 #define QT_SOCKET_BIND          ::bind
    98 #define QT_FILENO               fileno
    99 #define QT_OPEN                 ::open
    100 #define QT_CLOSE                ::close
    101 #define QT_TRUNCATE             ::truncate
    102 #define QT_FTRUNCATE            ::ftruncate
    103 #define QT_LSEEK                ::lseek
    104 #define QT_READ                 ::read
    105 #define QT_WRITE                ::write
    106 #define QT_ACCESS               ::access
    107 #define QT_GETCWD               ::getcwd
    108 #define QT_CHDIR                ::chdir
    109 #define QT_MKDIR                ::mkdir
    110 #define QT_RMDIR                ::rmdir
     80#undef QT_OPEN_LARGEFILE
     81#undef QT_SOCKLEN_T
     82#undef QT_SIGNAL_IGNORE
     83
    11184#define QT_OPEN_LARGEFILE       0
    112 #define QT_OPEN_RDONLY          O_RDONLY
    113 #define QT_OPEN_WRONLY          O_WRONLY
    114 #define QT_OPEN_RDWR            O_RDWR
    115 #define QT_OPEN_CREAT           O_CREAT
    116 #define QT_OPEN_TRUNC           O_TRUNC
    117 #define QT_OPEN_APPEND          O_APPEND
    118 
    119 #define QT_SIGNAL_RETTYPE       void
    120 #define QT_SIGNAL_ARGS          int
    121 #define QT_SIGNAL_IGNORE        (void (*)(int))1
    12285
    12386#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4)
    124 #define QT_SOCKLEN_T            socklen_t
     87#define QT_SOCKLEN_T            socklen_t
    12588#else
    126 #define QT_SOCKLEN_T            int
     89#define QT_SOCKLEN_T            int
    12790#endif
     91
     92#define QT_SIGNAL_IGNORE        (void (*)(int))1
    12893
    12994#define QT_SNPRINTF             ::snprintf
    13095#define QT_VSNPRINTF            ::vsnprintf
    13196
    132 
    13397#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/macx-xlc/qmake.conf

    r2 r846  
    66
    77MAKEFILE_GENERATOR      = UNIX
     8TARGET_PLATFORM         = macx
    89TEMPLATE                = app
    910CONFIG                  += qt warn_on release app_bundle global_init_link_order lib_version_first plugin_no_soname link_prl

  • trunk/mkspecs/macx-xlc/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)
    … …  
    7676#endif
    7777
    78 #define QT_FOPEN                ::fopen
    79 #define QT_FSEEK                ::fseeko
    80 #define QT_FTELL                ::ftello
    81 #define QT_FGETPOS              ::fgetpos
    82 #define QT_FSETPOS              ::fsetpos
    83 #define QT_MMAP                 ::mmap
    84 #define QT_FPOS_T               fpos_t
    85 #define QT_OFF_T                off_t
     78#include "../common/posix/qplatformdefs.h"
    8679
    87 #define QT_STATBUF              struct stat
    88 #define QT_STATBUF4TSTAT        struct stat
    89 #define QT_STAT                 ::stat
    90 #define QT_FSTAT                ::fstat
    91 #define QT_LSTAT                ::lstat
    92 #define QT_STAT_REG             S_IFREG
    93 #define QT_STAT_DIR             S_IFDIR
    94 #define QT_STAT_MASK            S_IFMT
    95 #define QT_STAT_LNK             S_IFLNK
    96 #define QT_SOCKET_CONNECT       ::connect
    97 #define QT_SOCKET_BIND          ::bind
    98 #define QT_FILENO               fileno
    99 #define QT_OPEN                 ::open
    100 #define QT_CLOSE                ::close
    101 #define QT_TRUNCATE             ::truncate
    102 #define QT_FTRUNCATE            ::ftruncate
    103 #define QT_LSEEK                ::lseek
    104 #define QT_READ                 ::read
    105 #define QT_WRITE                ::write
    106 #define QT_ACCESS               ::access
    107 #define QT_GETCWD               ::getcwd
    108 #define QT_CHDIR                ::chdir
    109 #define QT_MKDIR                ::mkdir
    110 #define QT_RMDIR                ::rmdir
    111 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    112 #define QT_OPEN_RDONLY          O_RDONLY
    113 #define QT_OPEN_WRONLY          O_WRONLY
    114 #define QT_OPEN_RDWR            O_RDWR
    115 #define QT_OPEN_CREAT           O_CREAT
    116 #define QT_OPEN_TRUNC           O_TRUNC
    117 #define QT_OPEN_APPEND          O_APPEND
     80#undef QT_SOCKLEN_T
     81#undef QT_SIGNAL_IGNORE
    11882
    119 #define QT_SIGNAL_RETTYPE       void
    120 #define QT_SIGNAL_ARGS          int
    121 #define QT_SIGNAL_IGNORE        (void (*)(int))1
    122 
    123 #define QT_SOCKLEN_T            int
     83#define QT_SOCKLEN_T            int
     84#define QT_SIGNAL_IGNORE        (void (*)(int))1
    12485
    12586#define QT_SNPRINTF             ::snprintf
    12687#define QT_VSNPRINTF            ::vsnprintf
    12788
    128 
    12989#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/netbsd-g++/qmake.conf

    r2 r846  
    44
    55MAKEFILE_GENERATOR      = UNIX
     6TARGET_PLATFORM         = unix
    67TEMPLATE                = app
    78CONFIG                  += qt warn_on release link_prl
    … …  
    5859QMAKE_LFLAGS_THREAD     = -pthread
    5960QMAKE_LFLAGS_NOUNDEF    = -Wl,-no_unresolved
    60 QMAKE_RPATH             = -Wl,-rpath,
     61QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
    6162
    6263QMAKE_LIBS              =

  • trunk/mkspecs/netbsd-g++/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)
    … …  
    7676#endif
    7777
    78 #define QT_FOPEN                ::fopen
    79 #define QT_FSEEK                ::fseeko
    80 #define QT_FTELL                ::ftello
    81 #define QT_FGETPOS              ::fgetpos
    82 #define QT_FSETPOS              ::fsetpos
    83 #define QT_MMAP                 ::mmap
    84 #define QT_FPOS_T               fpos_t
    85 #define QT_OFF_T                off_t
     78#include "../common/posix/qplatformdefs.h"
    8679
    87 #define QT_STATBUF              struct stat
    88 #define QT_STATBUF4TSTAT        struct stat
    89 #define QT_STAT                 ::stat
    90 #define QT_FSTAT                ::fstat
    91 #define QT_LSTAT                ::lstat
    92 #define QT_STAT_REG             S_IFREG
    93 #define QT_STAT_DIR             S_IFDIR
    94 #define QT_STAT_MASK            S_IFMT
    95 #define QT_STAT_LNK             S_IFLNK
    96 #define QT_SOCKET_CONNECT       ::connect
    97 #define QT_SOCKET_BIND          ::bind
    98 #define QT_FILENO               fileno
    99 #define QT_OPEN                 ::open
    100 #define QT_CLOSE                ::close
    101 #define QT_TRUNCATE             ::truncate
    102 #define QT_FTRUNCATE            ::ftruncate
    103 #define QT_LSEEK                ::lseek
    104 #define QT_READ                 ::read
    105 #define QT_WRITE                ::write
    106 #define QT_ACCESS               ::access
    107 #define QT_GETCWD               ::getcwd
    108 #define QT_CHDIR                ::chdir
    109 #define QT_MKDIR                ::mkdir
    110 #define QT_RMDIR                ::rmdir
     80#undef QT_OPEN_LARGEFILE
    11181#define QT_OPEN_LARGEFILE       0
    112 #define QT_OPEN_RDONLY          O_RDONLY
    113 #define QT_OPEN_WRONLY          O_WRONLY
    114 #define QT_OPEN_RDWR            O_RDWR
    115 #define QT_OPEN_CREAT           O_CREAT
    116 #define QT_OPEN_TRUNC           O_TRUNC
    117 #define QT_OPEN_APPEND          O_APPEND
    11882
    119 #define QT_SIGNAL_RETTYPE       void
    120 #define QT_SIGNAL_ARGS          int
    121 #define QT_SIGNAL_IGNORE        SIG_IGN
    122 
    123 // NetBSD 1.0 - 1.3.3           int
    124 // NetBSD 1.4 - 1.5             socklen_t
    125 #define QT_SOCKLEN_T            socklen_t
     83// QT_SOCKLEN_T
     84// NetBSD 1.0 - 1.3.3           int
     85// NetBSD 1.4 - 1.5             socklen_t
    12686
    12787#define QT_SNPRINTF             ::snprintf
    … …  
    13393#endif
    13494
    135 
    13695#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/openbsd-g++/qmake.conf

    r2 r846  
    44
    55MAKEFILE_GENERATOR      = UNIX
     6TARGET_PLATFORM         = unix
    67TEMPLATE                = app
    78CONFIG                  += qt warn_on release link_prl

  • trunk/mkspecs/openbsd-g++/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)
    … …  
    7777#endif
    7878
    79 #define QT_FOPEN                ::fopen
    80 #define QT_FSEEK                ::fseeko
    81 #define QT_FTELL                ::ftello
    82 #define QT_FGETPOS              ::fgetpos
    83 #define QT_FSETPOS              ::fsetpos
    84 #define QT_MMAP                 ::mmap
    85 #define QT_FPOS_T               fpos_t
    86 #define QT_OFF_T                off_t
     79#include "../common/posix/qplatformdefs.h"
    8780
    88 #define QT_STATBUF              struct stat
    89 #define QT_STATBUF4TSTAT        struct stat
    90 #define QT_STAT                 ::stat
    91 #define QT_FSTAT                ::fstat
    92 #define QT_LSTAT                ::lstat
    93 #define QT_STAT_REG             S_IFREG
    94 #define QT_STAT_DIR             S_IFDIR
    95 #define QT_STAT_MASK            S_IFMT
    96 #define QT_STAT_LNK             S_IFLNK
    97 #define QT_SOCKET_CONNECT       ::connect
    98 #define QT_SOCKET_BIND          ::bind
    99 #define QT_FILENO               fileno
    100 #define QT_OPEN                 ::open
    101 #define QT_CLOSE                ::close
    102 #define QT_TRUNCATE             ::truncate
    103 #define QT_FTRUNCATE            ::ftruncate
    104 #define QT_LSEEK                ::lseek
    105 #define QT_READ                 ::read
    106 #define QT_WRITE                ::write
    107 #define QT_ACCESS               ::access
    108 #define QT_GETCWD               ::getcwd
    109 #define QT_CHDIR                ::chdir
    110 #define QT_MKDIR                ::mkdir
    111 #define QT_RMDIR                ::rmdir
     81#undef QT_OPEN_LARGEFILE
    11282#define QT_OPEN_LARGEFILE       0
    113 #define QT_OPEN_RDONLY          O_RDONLY
    114 #define QT_OPEN_WRONLY          O_WRONLY
    115 #define QT_OPEN_RDWR            O_RDWR
    116 #define QT_OPEN_CREAT           O_CREAT
    117 #define QT_OPEN_TRUNC           O_TRUNC
    118 #define QT_OPEN_APPEND          O_APPEND
    11983
    120 #define QT_SIGNAL_RETTYPE       void
    121 #define QT_SIGNAL_ARGS          int
    122 #define QT_SIGNAL_IGNORE        SIG_IGN
    123 
    124 // OpenBSD 2.2 - 2.4            int
    125 // OpenBSD 2.5 - 2.8            socklen_t
    126 #define QT_SOCKLEN_T            socklen_t
     84// QT_SOCKLEN_T
     85// OpenBSD 2.2 - 2.4            int
     86// OpenBSD 2.5 - 2.8            socklen_t
    12787
    12888#define QT_SNPRINTF             ::snprintf
    … …  
    149109#endif
    150110
    151 
    152111#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/qws/freebsd-generic-g++/qmake.conf

    r2 r846  
    44
    55MAKEFILE_GENERATOR      = UNIX
     6TARGET_PLATFORM         = unix
    67TEMPLATE                = app
    78CONFIG                  += qt warn_on release
    … …  
    5657QMAKE_LFLAGS_SONAME     = -Wl,-soname,
    5758QMAKE_LFLAGS_THREAD     = -pthread
    58 QMAKE_RPATH             = -Wl,-rpath,
     59QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
    5960
    6061QMAKE_LIBS              =

  • trunk/mkspecs/qws/freebsd-generic-g++/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)

  • trunk/mkspecs/qws/linux-arm-g++/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)

  • trunk/mkspecs/qws/linux-armv6-g++/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)

  • trunk/mkspecs/qws/linux-avr32-g++/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)

  • trunk/mkspecs/qws/linux-cellon-g++/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)

  • trunk/mkspecs/qws/linux-dm7000-g++/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)

  • trunk/mkspecs/qws/linux-dm800-g++/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)

  • trunk/mkspecs/qws/linux-generic-g++-32/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)

  • trunk/mkspecs/qws/linux-generic-g++/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)

  • trunk/mkspecs/qws/linux-ipaq-g++/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)

  • trunk/mkspecs/qws/linux-lsb-g++/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)

  • trunk/mkspecs/qws/linux-mips-g++/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)

  • trunk/mkspecs/qws/linux-powerpc-g++/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)

  • trunk/mkspecs/qws/linux-sh-g++/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)

  • trunk/mkspecs/qws/linux-sh4al-g++/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)

  • trunk/mkspecs/qws/linux-sharp-g++/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)

  • trunk/mkspecs/qws/linux-x86-g++/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)

  • trunk/mkspecs/qws/linux-x86_64-g++/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)

  • trunk/mkspecs/qws/linux-zylonite-g++/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)

  • trunk/mkspecs/qws/macx-generic-g++/qmake.conf

    r2 r846  
    44
    55MAKEFILE_GENERATOR      = UNIX
     6TARGET_PLATFORM         = macx
    67TEMPLATE                = app
    78CONFIG                  += qt warn_on release link_prl
    … …  
    5758QMAKE_LFLAGS_SONAME     =
    5859QMAKE_LFLAGS_THREAD     =
    59 QMAKE_RPATH             =
     60QMAKE_LFLAGS_RPATH      =
    6061
    6162QMAKE_LIBS              =

  • trunk/mkspecs/qws/macx-generic-g++/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)

  • trunk/mkspecs/qws/solaris-generic-g++/qmake.conf

    r2 r846  
    44
    55MAKEFILE_GENERATOR      = UNIX
     6TARGET_PLATFORM         = unix
    67TEMPLATE                = app
    78CONFIG                  += qt warn_on release link_prl
    … …  
    5758QMAKE_LFLAGS_SONAME     = -Wl,-soname,
    5859QMAKE_LFLAGS_THREAD     =
    59 QMAKE_RPATH             = -Wl,-rpath,
     60QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
    6061
    6162QMAKE_LIBS              = -lsocket -lnsl -lresolv

  • trunk/mkspecs/qws/solaris-generic-g++/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)

  • trunk/mkspecs/sco-cc/qmake.conf

    r2 r846  
    99
    1010MAKEFILE_GENERATOR      = UNIX
     11TARGET_PLATFORM         = unix
    1112TEMPLATE                = app
    1213QT                      += core gui

  • trunk/mkspecs/sco-cc/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)
    … …  
    7777#endif
    7878
    79 #define QT_FOPEN                ::fopen
    80 #define QT_FSEEK                ::fseeko
    81 #define QT_FTELL                ::ftello
    82 #define QT_FGETPOS              ::fgetpos
    83 #define QT_FSETPOS              ::fsetpos
    84 #define QT_MMAP                 ::mmap
    85 #define QT_FPOS_T               fpos_t
    86 #define QT_OFF_T                off_t
     79#include "../common/posix/qplatformdefs.h"
    8780
    88 #define QT_STATBUF              struct stat
    89 #define QT_STATBUF4TSTAT        struct stat
    90 #define QT_STAT                 ::stat
    91 #define QT_FSTAT                ::fstat
    92 #define QT_LSTAT                ::lstat
    93 #define QT_STAT_REG             S_IFREG
    94 #define QT_STAT_DIR             S_IFDIR
    95 #define QT_STAT_MASK            S_IFMT
    96 #define QT_STAT_LNK             S_IFLNK
    97 #define QT_SOCKET_CONNECT       ::connect
    98 #define QT_SOCKET_BIND          ::bind
    99 #define QT_FILENO               fileno
    100 #define QT_OPEN                 ::open
    101 #define QT_CLOSE                ::close
    102 #define QT_TRUNCATE             ::truncate
    103 #define QT_FTRUNCATE            ::ftruncate
    104 #define QT_LSEEK                ::lseek
    105 #define QT_READ                 ::read
    106 #define QT_WRITE                ::write
    107 #define QT_ACCESS               ::access
    108 #define QT_GETCWD               ::getcwd
    109 #define QT_CHDIR                ::chdir
    110 #define QT_MKDIR                ::mkdir
    111 #define QT_RMDIR                ::rmdir
    112 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    113 #define QT_OPEN_RDONLY          O_RDONLY
    114 #define QT_OPEN_WRONLY          O_WRONLY
    115 #define QT_OPEN_RDWR            O_RDWR
    116 #define QT_OPEN_CREAT           O_CREAT
    117 #define QT_OPEN_TRUNC           O_TRUNC
    118 #define QT_OPEN_APPEND          O_APPEND
    119 
    120 #define QT_SIGNAL_RETTYPE       void
    121 #define QT_SIGNAL_ARGS          int
    122 #define QT_SIGNAL_IGNORE        SIG_IGN
    123 
    124 #define QT_SOCKLEN_T            size_t
     81#undef QT_SOCKLEN_T
     82#define QT_SOCKLEN_T            size_t
    12583
    12684#define QT_SNPRINTF             ::snprintf
    12785#define QT_VSNPRINTF            ::vsnprintf
    12886
    129 
    13087#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/sco-g++/qmake.conf

    r2 r846  
    66
    77MAKEFILE_GENERATOR      = UNIX
     8TARGET_PLATFORM         = unix
    89TEMPLATE                = app
    910CONFIG                  += qt warn_on release link_prl
    … …  
    5556QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
    5657QMAKE_LFLAGS_SONAME     = -h$$LITERAL_WHITESPACE
    57 QMAKE_RPATH             =
     58QMAKE_LFLAGS_RPATH      =
    5859
    5960QMAKE_LIBS              =

  • trunk/mkspecs/sco-g++/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)
    … …  
    8181#endif
    8282
    83 #define QT_FOPEN                ::fopen
    84 #define QT_FSEEK                ::fseeko
    85 #define QT_FTELL                ::ftello
    86 #define QT_FGETPOS              ::fgetpos
    87 #define QT_FSETPOS              ::fsetpos
    88 #define QT_MMAP                 ::mmap
    89 #define QT_FPOS_T               fpos_t
    90 #define QT_OFF_T                off_t
     83#include "../common/posix/qplatformdefs.h"
    9184
    92 #define QT_STATBUF              struct stat
    93 #define QT_STATBUF4TSTAT        struct stat
    94 #define QT_STAT                 ::stat
    95 #define QT_FSTAT                ::fstat
    96 #define QT_LSTAT                ::lstat
    97 #define QT_STAT_REG             S_IFREG
    98 #define QT_STAT_DIR             S_IFDIR
    99 #define QT_STAT_MASK            S_IFMT
    100 #define QT_STAT_LNK             S_IFLNK
    101 #define QT_SOCKET_CONNECT       ::connect
    102 #define QT_SOCKET_BIND          ::bind
    103 #define QT_FILENO               fileno
    104 #define QT_OPEN                 ::open
    105 #define QT_CLOSE                ::close
    106 #define QT_TRUNCATE             ::truncate
    107 #define QT_FTRUNCATE            ::ftruncate
    108 #define QT_LSEEK                ::lseek
    109 #define QT_READ                 ::read
    110 #define QT_WRITE                ::write
    111 #define QT_ACCESS               ::access
    112 #define QT_GETCWD               ::getcwd
    113 #define QT_CHDIR                ::chdir
    114 #define QT_MKDIR                ::mkdir
    115 #define QT_RMDIR                ::rmdir
    116 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    117 #define QT_OPEN_RDONLY          O_RDONLY
    118 #define QT_OPEN_WRONLY          O_WRONLY
    119 #define QT_OPEN_RDWR            O_RDWR
    120 #define QT_OPEN_CREAT           O_CREAT
    121 #define QT_OPEN_TRUNC           O_TRUNC
    122 #define QT_OPEN_APPEND          O_APPEND
    123 
    124 #define QT_SIGNAL_RETTYPE       void
    125 #define QT_SIGNAL_ARGS          int
    126 #define QT_SIGNAL_IGNORE        SIG_IGN
    127 
    128 #define QT_SOCKLEN_T            int
     85#undef QT_SOCKLEN_T
     86#define QT_SOCKLEN_T            int
    12987
    13088#define QT_SNPRINTF             ::snprintf
    13189#define QT_VSNPRINTF            ::vsnprintf
    13290
    133 
    13491#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/solaris-cc-64-stlport/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)

  • trunk/mkspecs/solaris-cc-64/qmake.conf

    r2 r846  
    2323
    2424MAKEFILE_GENERATOR      = UNIX
     25TARGET_PLATFORM         = unix
    2526TEMPLATE                = app
    2627CONFIG                  += qt warn_on release link_prl
    … …  
    4243QMAKE_CFLAGS_YACC       =
    4344QMAKE_CFLAGS_THREAD     = -mt
     45QMAKE_CFLAGS_HIDESYMS   = -xldscope=hidden
    4446
    4547QMAKE_CXX               = CC
    … …  
    5456QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
    5557QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
     58QMAKE_CXXFLAGS_HIDESYMS = $$QMAKE_CFLAGS_HIDESYMS
    5659
    5760QMAKE_INCDIR            = /usr/sfw/include
    … …  
    7477QMAKE_LFLAGS_THREAD     = -mt
    7578QMAKE_LFLAGS_NOUNDEF    = -z defs
    76 QMAKE_RPATH             = -R
     79QMAKE_LFLAGS_RPATH      = -R
    7780
    7881QMAKE_LIBS              =

  • trunk/mkspecs/solaris-cc-64/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)
    … …  
    7777#endif
    7878
    79 // On 64-bit platforms sockets use socklen_t
    80 #define QT_SOCKLEN_T            socklen_t
     79#define QT_USE_XOPEN_LFS_EXTENSIONS
     80#include "../common/posix/qplatformdefs.h"
     81
     82#undef QT_SOCKET_CONNECT
     83#define QT_SOCKET_CONNECT       qt_socket_connect
    8184
    8285// Solaris redefines connect -> __xnet_connect with _XOPEN_SOURCE_EXTENDED
    8386static inline int qt_socket_connect(int s, struct sockaddr *addr, QT_SOCKLEN_T addrlen)
    8487{ return ::connect(s, addr, addrlen); }
    85 
    86 #ifdef QT_LARGEFILE_SUPPORT
    87 #define QT_STATBUF              struct stat64
    88 #define QT_STATBUF4TSTAT        struct stat64
    89 #define QT_STAT                 ::stat64
    90 #define QT_FSTAT                ::fstat64
    91 #define QT_LSTAT                ::lstat64
    92 #define QT_OPEN                 ::open64
    93 #define QT_TRUNCATE             ::truncate64
    94 #define QT_FTRUNCATE            ::ftruncate64
    95 #define QT_LSEEK                ::lseek64
    96 #else
    97 #define QT_STATBUF              struct stat
    98 #define QT_STATBUF4TSTAT        struct stat
    99 #define QT_STAT                 ::stat
    100 #define QT_FSTAT                ::fstat
    101 #define QT_LSTAT                ::lstat
    102 #define QT_OPEN                 ::open
    103 #define QT_TRUNCATE             ::truncate
    104 #define QT_FTRUNCATE            ::ftruncate
    105 #define QT_LSEEK                ::lseek
    106 #endif
    107 
    108 #ifdef QT_LARGEFILE_SUPPORT
    109 #define QT_FOPEN                ::fopen64
    110 #define QT_FSEEK                ::fseeko64
    111 #define QT_FTELL                ::ftello64
    112 #define QT_FGETPOS              ::fgetpos64
    113 #define QT_FSETPOS              ::fsetpos64
    114 #define QT_MMAP                 ::mmap64
    115 #define QT_FPOS_T               fpos64_t
    116 #define QT_OFF_T                off64_t
    117 #else
    118 #define QT_FOPEN                ::fopen
    119 #define QT_FSEEK                ::fseek
    120 #define QT_FTELL                ::ftell
    121 #define QT_FGETPOS              ::fgetpos
    122 #define QT_FSETPOS              ::fsetpos
    123 #define QT_MMAP                 ::mmap
    124 #define QT_FPOS_T               fpos_t
    125 #define QT_OFF_T                long
    126 #endif
    127 
    128 #define QT_STAT_REG             S_IFREG
    129 #define QT_STAT_DIR             S_IFDIR
    130 #define QT_STAT_MASK            S_IFMT
    131 #define QT_STAT_LNK             S_IFLNK
    132 #define QT_SOCKET_CONNECT       qt_socket_connect
    133 #define QT_SOCKET_BIND          ::bind
    134 #define QT_FILENO               fileno
    135 #define QT_CLOSE                ::close
    136 #define QT_READ                 ::read
    137 #define QT_WRITE                ::write
    138 #define QT_ACCESS               ::access
    139 #define QT_GETCWD               ::getcwd
    140 #define QT_CHDIR                ::chdir
    141 #define QT_MKDIR                ::mkdir
    142 #define QT_RMDIR                ::rmdir
    143 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    144 #define QT_OPEN_RDONLY          O_RDONLY
    145 #define QT_OPEN_WRONLY          O_WRONLY
    146 #define QT_OPEN_RDWR            O_RDWR
    147 #define QT_OPEN_CREAT           O_CREAT
    148 #define QT_OPEN_TRUNC           O_TRUNC
    149 #define QT_OPEN_APPEND          O_APPEND
    150 
    151 #define QT_SIGNAL_RETTYPE       void
    152 #define QT_SIGNAL_ARGS          int
    153 #define QT_SIGNAL_IGNORE        SIG_IGN
    15488
    15589// Only Solaris 7 and better support 64-bit

  • trunk/mkspecs/solaris-cc-stlport/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)

  • trunk/mkspecs/solaris-cc/qmake.conf

    r2 r846  
    66
    77MAKEFILE_GENERATOR      = UNIX
     8TARGET_PLATFORM         = unix
    89TEMPLATE                = app
    910CONFIG                  += qt warn_on release link_prl
    … …  
    2526QMAKE_CFLAGS_YACC       =
    2627QMAKE_CFLAGS_THREAD     = -mt
     28QMAKE_CFLAGS_HIDESYMS   = -xldscope=hidden
    2729
    2830QMAKE_CXX               = CC
    … …  
    3739QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
    3840QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
     41QMAKE_CXXFLAGS_HIDESYMS = $$QMAKE_CFLAGS_HIDESYMS
    3942
    4043QMAKE_INCDIR            = /usr/sfw/include
    … …  
    5760QMAKE_LFLAGS_THREAD     = -mt
    5861QMAKE_LFLAGS_NOUNDEF    = -z defs
    59 QMAKE_RPATH             = -R
     62QMAKE_LFLAGS_RPATH      = -R
    6063
    6164QMAKE_LIBS              =

  • trunk/mkspecs/solaris-cc/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)
    … …  
    7777#endif
    7878
     79#define QT_USE_XOPEN_LFS_EXTENSIONS
     80#include "../common/posix/qplatformdefs.h"
     81
     82#undef QT_SOCKLEN_T
     83#undef QT_SOCKET_CONNECT
     84
     85#define QT_SOCKET_CONNECT       qt_socket_connect
     86
    7987#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500) && (_XOPEN_VERSION-0 >= 500)
    8088// Solaris 7 and better with specific feature test macros
    81 #define QT_SOCKLEN_T            socklen_t
     89#define QT_SOCKLEN_T            socklen_t
    8290#elif defined(_XOPEN_SOURCE_EXTENDED) && (_XOPEN_VERSION-0 >= 4)
    8391// Solaris 2.6 and better with specific feature test macros
    84 #define QT_SOCKLEN_T            size_t
     92#define QT_SOCKLEN_T            size_t
    8593#else
    8694// always this case in practice
    87 #define QT_SOCKLEN_T            int
     95#define QT_SOCKLEN_T            int
    8896#endif
    8997
    … …  
    9199static inline int qt_socket_connect(int s, struct sockaddr *addr, QT_SOCKLEN_T addrlen)
    92100{ return ::connect(s, addr, addrlen); }
    93 
    94 #ifdef QT_LARGEFILE_SUPPORT
    95 #define QT_STATBUF              struct stat64
    96 #define QT_STATBUF4TSTAT        struct stat64
    97 #define QT_STAT                 ::stat64
    98 #define QT_FSTAT                ::fstat64
    99 #define QT_LSTAT                ::lstat64
    100 #define QT_OPEN                 ::open64
    101 #define QT_TRUNCATE             ::truncate64
    102 #define QT_FTRUNCATE            ::ftruncate64
    103 #define QT_LSEEK                ::lseek64
    104 #else
    105 #define QT_STATBUF              struct stat
    106 #define QT_STATBUF4TSTAT        struct stat
    107 #define QT_STAT                 ::stat
    108 #define QT_FSTAT                ::fstat
    109 #define QT_LSTAT                ::lstat
    110 #define QT_OPEN                 ::open
    111 #define QT_TRUNCATE             ::truncate
    112 #define QT_FTRUNCATE            ::ftruncate
    113 #define QT_LSEEK                ::lseek
    114 #endif
    115 
    116 #ifdef QT_LARGEFILE_SUPPORT
    117 #define QT_FOPEN                ::fopen64
    118 #define QT_FSEEK                ::fseeko64
    119 #define QT_FTELL                ::ftello64
    120 #define QT_FGETPOS              ::fgetpos64
    121 #define QT_FSETPOS              ::fsetpos64
    122 #define QT_MMAP                 ::mmap64
    123 #define QT_FPOS_T               fpos64_t
    124 #define QT_OFF_T                off64_t
    125 #else
    126 #define QT_FOPEN                ::fopen
    127 #define QT_FSEEK                ::fseek
    128 #define QT_FTELL                ::ftell
    129 #define QT_FGETPOS              ::fgetpos
    130 #define QT_FSETPOS              ::fsetpos
    131 #define QT_MMAP                 ::mmap
    132 #define QT_FPOS_T               fpos_t
    133 #define QT_OFF_T                long
    134 #endif
    135 
    136 #define QT_STAT_REG             S_IFREG
    137 #define QT_STAT_DIR             S_IFDIR
    138 #define QT_STAT_MASK            S_IFMT
    139 #define QT_STAT_LNK             S_IFLNK
    140 #define QT_SOCKET_CONNECT       qt_socket_connect
    141 #define QT_SOCKET_BIND          ::bind
    142 #define QT_FILENO               fileno
    143 #define QT_CLOSE                ::close
    144 #define QT_READ                 ::read
    145 #define QT_WRITE                ::write
    146 #define QT_ACCESS               ::access
    147 #define QT_GETCWD               ::getcwd
    148 #define QT_CHDIR                ::chdir
    149 #define QT_MKDIR                ::mkdir
    150 #define QT_RMDIR                ::rmdir
    151 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    152 #define QT_OPEN_RDONLY          O_RDONLY
    153 #define QT_OPEN_WRONLY          O_WRONLY
    154 #define QT_OPEN_RDWR            O_RDWR
    155 #define QT_OPEN_CREAT           O_CREAT
    156 #define QT_OPEN_TRUNC           O_TRUNC
    157 #define QT_OPEN_APPEND          O_APPEND
    158 
    159 #define QT_SIGNAL_RETTYPE       void
    160 #define QT_SIGNAL_ARGS          int
    161 #define QT_SIGNAL_IGNORE        SIG_IGN
    162101
    163102#if !defined(_XOPEN_UNIX)

  • trunk/mkspecs/solaris-g++-64/qmake.conf

    r2 r846  
    2727
    2828MAKEFILE_GENERATOR      = UNIX
     29TARGET_PLATFORM         = unix
    2930TEMPLATE                = app
    3031CONFIG                  += qt warn_on release link_prl
    … …  
    8081QMAKE_LFLAGS_THREAD     =
    8182QMAKE_LFLAGS_NOUNDEF    = -z defs
    82 QMAKE_RPATH             = -Wl,-R,
     83QMAKE_LFLAGS_RPATH      = -Wl,-R,
    8384
    8485QMAKE_LIBS              =

  • trunk/mkspecs/solaris-g++-64/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)
    … …  
    8080#endif
    8181
    82 // On 64-bit platforms sockets use socklen_t
    83 #define QT_SOCKLEN_T            socklen_t
     82#define QT_USE_XOPEN_LFS_EXTENSIONS
     83#include "../common/posix/qplatformdefs.h"
    8484
    85 // Only Solaris 7 and better support 64-bit
    86 #define QT_SNPRINTF             ::snprintf
    87 #define QT_VSNPRINTF            ::vsnprintf
     85#undef QT_SOCKET_CONNECT
     86#define QT_SOCKET_CONNECT       qt_socket_connect
    8887
    8988// Solaris redefines connect -> __xnet_connect with _XOPEN_SOURCE_EXTENDED
    … …  
    101100#endif
    102101
    103 #ifdef QT_LARGEFILE_SUPPORT
    104 #define QT_STATBUF              struct stat64
    105 #define QT_STATBUF4TSTAT        struct stat64
    106 #define QT_STAT                 ::stat64
    107 #define QT_FSTAT                ::fstat64
    108 #define QT_LSTAT                ::lstat64
    109 #define QT_OPEN                 ::open64
    110 #define QT_TRUNCATE             ::truncate64
    111 #define QT_FTRUNCATE            ::ftruncate64
    112 #define QT_LSEEK                ::lseek64
    113 #else
    114 #define QT_STATBUF              struct stat
    115 #define QT_STATBUF4TSTAT        struct stat
    116 #define QT_STAT                 ::stat
    117 #define QT_FSTAT                ::fstat
    118 #define QT_LSTAT                ::lstat
    119 #define QT_OPEN                 ::open
    120 #define QT_TRUNCATE             ::truncate
    121 #define QT_FTRUNCATE            ::ftruncate
    122 #define QT_LSEEK                ::lseek
    123 #endif
    124 
    125 #ifdef QT_LARGEFILE_SUPPORT
    126 #define QT_FOPEN                ::fopen64
    127 #define QT_FSEEK                ::fseeko64
    128 #define QT_FTELL                ::ftello64
    129 #define QT_FGETPOS              ::fgetpos64
    130 #define QT_FSETPOS              ::fsetpos64
    131 #define QT_MMAP                 ::mmap64
    132 #define QT_FPOS_T               fpos64_t
    133 #define QT_OFF_T                off64_t
    134 #else
    135 #define QT_FOPEN                ::fopen
    136 #define QT_FSEEK                ::fseek
    137 #define QT_FTELL                ::ftell
    138 #define QT_FGETPOS              ::fgetpos
    139 #define QT_FSETPOS              ::fsetpos
    140 #define QT_MMAP                 ::mmap
    141 #define QT_FPOS_T               fpos_t
    142 #define QT_OFF_T                long
    143 #endif
    144 
    145 #define QT_STAT_REG             S_IFREG
    146 #define QT_STAT_DIR             S_IFDIR
    147 #define QT_STAT_MASK            S_IFMT
    148 #define QT_STAT_LNK             S_IFLNK
    149 #define QT_SOCKET_CONNECT       qt_socket_connect
    150 #define QT_SOCKET_BIND          ::bind
    151 #define QT_FILENO               fileno
    152 #define QT_CLOSE                ::close
    153 #define QT_READ                 ::read
    154 #define QT_WRITE                ::write
    155 #define QT_ACCESS               ::access
    156 #define QT_GETCWD               ::getcwd
    157 #define QT_CHDIR                ::chdir
    158 #define QT_MKDIR                ::mkdir
    159 #define QT_RMDIR                ::rmdir
    160 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    161 #define QT_OPEN_RDONLY          O_RDONLY
    162 #define QT_OPEN_WRONLY          O_WRONLY
    163 #define QT_OPEN_RDWR            O_RDWR
    164 #define QT_OPEN_CREAT           O_CREAT
    165 #define QT_OPEN_TRUNC           O_TRUNC
    166 #define QT_OPEN_APPEND          O_APPEND
    167 
    168 #define QT_SIGNAL_RETTYPE       void
    169 #define QT_SIGNAL_ARGS          int
    170 #define QT_SIGNAL_IGNORE        SIG_IGN
     102// Only Solaris 7 and better support 64-bit
     103#define QT_SNPRINTF             ::snprintf
     104#define QT_VSNPRINTF            ::vsnprintf
    171105
    172106#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/solaris-g++/qmake.conf

    r2 r846  
    1010
    1111MAKEFILE_GENERATOR      = UNIX
     12TARGET_PLATFORM         = unix
    1213TEMPLATE                = app
    1314CONFIG                  += qt warn_on release link_prl
    … …  
    6364QMAKE_LFLAGS_THREAD     =
    6465QMAKE_LFLAGS_NOUNDEF    = -z defs
    65 QMAKE_RPATH             = -Wl,-R,
     66QMAKE_LFLAGS_RPATH      = -Wl,-R,
    6667
    6768QMAKE_LIBS              =

  • trunk/mkspecs/solaris-g++/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)
    … …  
    8080#endif
    8181
     82#define QT_USE_XOPEN_LFS_EXTENSIONS
     83#include "../common/posix/qplatformdefs.h"
     84
     85#undef QT_SOCKLEN_T
     86#undef QT_SOCKET_CONNECT
     87#undef QT_SOCKET_BIND
     88
     89#define QT_SOCKET_CONNECT       qt_socket_connect
     90#define QT_SOCKET_BIND          qt_socket_bind
     91
    8292#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500) && (_XOPEN_VERSION-0 >= 500)
    8393// Solaris 7 and better with specific feature test macros
    … …  
    105115#endif
    106116
    107 #ifdef QT_LARGEFILE_SUPPORT
    108 #define QT_STATBUF              struct stat64
    109 #define QT_STATBUF4TSTAT        struct stat64
    110 #define QT_STAT                 ::stat64
    111 #define QT_FSTAT                ::fstat64
    112 #define QT_LSTAT                ::lstat64
    113 #define QT_OPEN                 ::open64
    114 #define QT_TRUNCATE             ::truncate64
    115 #define QT_FTRUNCATE            ::ftruncate64
    116 #define QT_LSEEK                ::lseek64
    117 #else
    118 #define QT_STATBUF              struct stat
    119 #define QT_STATBUF4TSTAT        struct stat
    120 #define QT_STAT                 ::stat
    121 #define QT_FSTAT                ::fstat
    122 #define QT_LSTAT                ::lstat
    123 #define QT_OPEN                 ::open
    124 #define QT_TRUNCATE             ::truncate
    125 #define QT_FTRUNCATE            ::ftruncate
    126 #define QT_LSEEK                ::lseek
    127 #endif
    128 
    129 #ifdef QT_LARGEFILE_SUPPORT
    130 #define QT_FOPEN                ::fopen64
    131 #define QT_FSEEK                ::fseeko64
    132 #define QT_FTELL                ::ftello64
    133 #define QT_FGETPOS              ::fgetpos64
    134 #define QT_FSETPOS              ::fsetpos64
    135 #define QT_MMAP                 ::mmap64
    136 #define QT_FPOS_T               fpos64_t
    137 #define QT_OFF_T                off64_t
    138 #else
    139 #define QT_FOPEN                ::fopen
    140 #define QT_FSEEK                ::fseek
    141 #define QT_FTELL                ::ftell
    142 #define QT_FGETPOS              ::fgetpos
    143 #define QT_FSETPOS              ::fsetpos
    144 #define QT_MMAP                 ::mmap
    145 #define QT_FPOS_T               fpos_t
    146 #define QT_OFF_T                long
    147 #endif
    148 
    149 #define QT_STAT_REG             S_IFREG
    150 #define QT_STAT_DIR             S_IFDIR
    151 #define QT_STAT_MASK            S_IFMT
    152 #define QT_STAT_LNK             S_IFLNK
    153 #define QT_SOCKET_CONNECT       qt_socket_connect
    154 #define QT_SOCKET_BIND          qt_socket_bind
    155 #define QT_FILENO               fileno
    156 #define QT_CLOSE                ::close
    157 #define QT_READ                 ::read
    158 #define QT_WRITE                ::write
    159 #define QT_ACCESS               ::access
    160 #define QT_GETCWD               ::getcwd
    161 #define QT_CHDIR                ::chdir
    162 #define QT_MKDIR                ::mkdir
    163 #define QT_RMDIR                ::rmdir
    164 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    165 #define QT_OPEN_RDONLY          O_RDONLY
    166 #define QT_OPEN_WRONLY          O_WRONLY
    167 #define QT_OPEN_RDWR            O_RDWR
    168 #define QT_OPEN_CREAT           O_CREAT
    169 #define QT_OPEN_TRUNC           O_TRUNC
    170 #define QT_OPEN_APPEND          O_APPEND
    171 
    172 #define QT_SIGNAL_RETTYPE       void
    173 #define QT_SIGNAL_ARGS          int
    174 #define QT_SIGNAL_IGNORE        SIG_IGN
    175 
    176117#if !defined(_XOPEN_UNIX)
    177118// Solaris 2.5.1

  • trunk/mkspecs/symbian-abld/qmake.conf

    r561 r846  
    66
    77MAKEFILE_GENERATOR      = SYMBIAN_ABLD
     8option(recursive)
    89
    9 include(../common/symbian/symbian.conf)
     10include(../common/symbian/symbian-mmp.conf)

  • trunk/mkspecs/symbian-abld/qplatformdefs.h

    r769 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)

  • trunk/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm

    r769 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# ** Contact: Nokia Corporation (qt-info@nokia.com)
    55# **
    … …  
    2222$(1): $(2)
    2323        $(call startrule,qmake_emulator_deployment) \
    24         $(GNUCP) --no-preserve=mode $(2) "$$@" && \
     24        $(GNUCP) --remove-destination --no-preserve=mode $(2) "$$@" && \
    2525        $(GNUCHMOD) a+rw "$$@" \
    2626        $(call endrule,qmake_emulator_deployment)       

  • trunk/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm

    r769 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# ** Contact: Nokia Corporation (qt-info@nokia.com)
    55# **
    … …  
    1212
    1313$(call makepathfor,$(PREDEP_TARGET))
     14
     15ifeq ($(patsubst /epoc32/%,MATCH,$(firstword $(COMMAND))),MATCH)
     16COMMAND:=$(EPOCROOT)$(COMMAND)
     17endif
    1418
    1519define qmake_extra_pre_targetdep

  • trunk/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm

    r769 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# ** Contact: Nokia Corporation (qt-info@nokia.com)
    55# **

  • trunk/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm

    r769 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# ** Contact: Nokia Corporation (qt-info@nokia.com)
    55# **
    … …  
    3939        echo "#  Version     : " >> $(CACHE_FILENAME) && \
    4040        echo "# ==============================================================================" >> $(CACHE_FILENAME) && \
    41         echo QT_SIS_TARGET ?= $(VISUAL_CFG)-$(PLATFORM_PATH) >> $(CACHE_FILENAME) \
     41        echo QT_SIS_TARGET ?= $(VISUAL_CFG)-$(PLATFORM_PATH) >> $(CACHE_FILENAME)
    4242        $(call endrule,qmake_store_build)
    4343endef

  • trunk/mkspecs/symbian-sbsv2/flm/qt/qt.xml

    r769 r846  
    33# /****************************************************************************
    44# **
    5 # ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     5# ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    66# ** Contact: Nokia Corporation (qt-info@nokia.com)
    77# **

  • trunk/mkspecs/symbian-sbsv2/qmake.conf

    r561 r846  
    66
    77MAKEFILE_GENERATOR  = SYMBIAN_SBSV2
     8option(recursive)
    89
    9 include(../common/symbian/symbian.conf)
     10include(../common/symbian/symbian-mmp.conf)

  • trunk/mkspecs/symbian-sbsv2/qplatformdefs.h

    r769 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)

  • trunk/mkspecs/tru64-cxx/qmake.conf

    r2 r846  
    44
    55MAKEFILE_GENERATOR      = UNIX
     6TARGET_PLATFORM         = unix
    67TEMPLATE                = app
    78CONFIG                  += qt warn_on release link_prl plugin_no_soname
    … …  
    5455QMAKE_LFLAGS_THREAD     = -pthread
    5556QMAKE_LFLAGS_SONAME     = -soname$$LITERAL_WHITESPACE
    56 QMAKE_RPATH             = -rpath$$LITERAL_WHITESPACE
     57QMAKE_LFLAGS_RPATH      = -rpath$$LITERAL_WHITESPACE
    5758
    5859QMAKE_LIBS              = -lm

  • trunk/mkspecs/tru64-cxx/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)
    … …  
    7979#endif
    8080
    81 #define QT_FOPEN                ::fopen
    82 #define QT_FSEEK                ::fseek
    83 #define QT_FTELL                ::ftell
    84 #define QT_FGETPOS              ::fgetpos
    85 #define QT_FSETPOS              ::fsetpos
    86 #define QT_MMAP                 ::mmap
    87 #define QT_FPOS_T               fpos_t
     81#define QT_NO_USE_FSEEKO
     82#include "../common/posix/qplatformdefs.h"
     83
     84#undef QT_OFF_T
     85#undef QT_SOCKLEN_T
     86
    8887#define QT_OFF_T                off_t
    8988
    90 #define QT_STATBUF              struct stat
    91 #define QT_STATBUF4TSTAT        struct stat
    92 #define QT_STAT                 ::stat
    93 #define QT_FSTAT                ::fstat
    94 #define QT_LSTAT                ::lstat
    95 #define QT_STAT_REG             S_IFREG
    96 #define QT_STAT_DIR             S_IFDIR
    97 #define QT_STAT_MASK            S_IFMT
    98 #define QT_STAT_LNK             S_IFLNK
    99 #define QT_SOCKET_CONNECT       ::connect
    100 #define QT_SOCKET_BIND          ::bind
    101 #define QT_FILENO               fileno
    102 #define QT_OPEN                 ::open
    103 #define QT_CLOSE                ::close
    104 #define QT_TRUNCATE             ::truncate
    105 #define QT_FTRUNCATE            ::ftruncate
    106 #define QT_LSEEK                ::lseek
    107 #define QT_READ                 ::read
    108 #define QT_WRITE                ::write
    109 #define QT_ACCESS               ::access
    110 #define QT_GETCWD               ::getcwd
    111 #define QT_CHDIR                ::chdir
    112 #define QT_MKDIR                ::mkdir
    113 #define QT_RMDIR                ::rmdir
    114 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    115 #define QT_OPEN_RDONLY          O_RDONLY
    116 #define QT_OPEN_WRONLY          O_WRONLY
    117 #define QT_OPEN_RDWR            O_RDWR
    118 #define QT_OPEN_CREAT           O_CREAT
    119 #define QT_OPEN_TRUNC           O_TRUNC
    120 #define QT_OPEN_APPEND          O_APPEND
    121 
    122 #define QT_SIGNAL_RETTYPE       void
    123 #define QT_SIGNAL_ARGS          int
    124 #define QT_SIGNAL_IGNORE        SIG_IGN
     89#if defined(_POSIX_PII_SOCKET)
     90#define QT_SOCKLEN_T            socklen_t
     91#elif defined(_XOPEN_SOURCE_EXTENDED)
     92#define QT_SOCKLEN_T            size_t
     93#else
     94#define QT_SOCKLEN_T            int
     95#endif
    12596
    12697#if defined(_XOPEN_SOURCE) && defined(_OSF_SOURCE)
    … …  
    12899// Fixed in the <unistd.h> header of Tru64 5.0A so we copy/paste from there...
    129100extern "C" int usleep(useconds_t);
    130 #endif
    131 
    132 #if defined(_POSIX_PII_SOCKET)
    133 #define QT_SOCKLEN_T            socklen_t
    134 #elif defined(_XOPEN_SOURCE_EXTENDED)
    135 #define QT_SOCKLEN_T            size_t
    136 #else
    137 #define QT_SOCKLEN_T            int
    138101#endif
    139102
    … …  
    144107#endif
    145108
    146 
    147109#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/tru64-g++/qmake.conf

    r2 r846  
    44
    55MAKEFILE_GENERATOR      = UNIX
     6TARGET_PLATFORM         = unix
    67TEMPLATE                = app
    78CONFIG                  += qt warn_on release link_prl plugin_no_soname
    … …  
    5657QMAKE_LFLAGS_THREAD     =
    5758QMAKE_LFLAGS_SONAME     = -Wl,-soname,
    58 QMAKE_RPATH             = -Wl,-rpath,
     59QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
    5960
    6061QMAKE_LIBS              =

  • trunk/mkspecs/tru64-g++/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)
    … …  
    7979#endif
    8080
    81 #define QT_FOPEN                ::fopen
    82 #define QT_FSEEK                ::fseek
    83 #define QT_FTELL                ::ftell
    84 #define QT_FGETPOS              ::fgetpos
    85 #define QT_FSETPOS              ::fsetpos
    86 #define QT_MMAP                 ::mmap
    87 #define QT_FPOS_T               fpos_t
     81#define QT_NO_USE_FSEEKO
     82#include "../common/posix/qplatformdefs.h"
     83
     84#undef QT_OFF_T
     85#undef QT_SOCKLEN_T
     86
    8887#define QT_OFF_T                off_t
    8988
    90 #define QT_STATBUF              struct stat
    91 #define QT_STATBUF4TSTAT        struct stat
    92 #define QT_STAT                 ::stat
    93 #define QT_FSTAT                ::fstat
    94 #define QT_LSTAT                ::lstat
    95 #define QT_STAT_REG             S_IFREG
    96 #define QT_STAT_DIR             S_IFDIR
    97 #define QT_STAT_MASK            S_IFMT
    98 #define QT_STAT_LNK             S_IFLNK
    99 #define QT_SOCKET_CONNECT       ::connect
    100 #define QT_SOCKET_BIND          ::bind
    101 #define QT_FILENO               fileno
    102 #define QT_OPEN                 ::open
    103 #define QT_CLOSE                ::close
    104 #define QT_TRUNCATE             ::truncate
    105 #define QT_FTRUNCATE            ::ftruncate
    106 #define QT_LSEEK                ::lseek
    107 #define QT_READ                 ::read
    108 #define QT_WRITE                ::write
    109 #define QT_ACCESS               ::access
    110 #define QT_GETCWD               ::getcwd
    111 #define QT_CHDIR                ::chdir
    112 #define QT_MKDIR                ::mkdir
    113 #define QT_RMDIR                ::rmdir
    114 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    115 #define QT_OPEN_RDONLY          O_RDONLY
    116 #define QT_OPEN_WRONLY          O_WRONLY
    117 #define QT_OPEN_RDWR            O_RDWR
    118 #define QT_OPEN_CREAT           O_CREAT
    119 #define QT_OPEN_TRUNC           O_TRUNC
    120 #define QT_OPEN_APPEND          O_APPEND
    121 
    122 #define QT_SIGNAL_RETTYPE       void
    123 #define QT_SIGNAL_ARGS          int
    124 #define QT_SIGNAL_IGNORE        SIG_IGN
     89#if defined(_POSIX_PII_SOCKET)
     90#define QT_SOCKLEN_T            socklen_t
     91#elif defined(_XOPEN_SOURCE_EXTENDED)
     92#define QT_SOCKLEN_T            size_t
     93#else
     94#define QT_SOCKLEN_T            int
     95#endif
    12596
    12697#if defined(_XOPEN_SOURCE) && defined(_OSF_SOURCE)
    … …  
    12899// Fixed in the <unistd.h> header of Tru64 5.0A so we copy/paste from there...
    129100extern "C" int usleep(useconds_t);
    130 #endif
    131 
    132 #if defined(_POSIX_PII_SOCKET)
    133 #  define QT_SOCKLEN_T          socklen_t
    134 #elif defined(_XOPEN_SOURCE_EXTENDED)
    135 #  define QT_SOCKLEN_T          size_t
    136 #else
    137 #  define QT_SOCKLEN_T          int
    138101#endif
    139102
    … …  
    144107#endif
    145108
    146 
    147109#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/unixware-cc/qmake.conf

    r2 r846  
    99
    1010MAKEFILE_GENERATOR      = UNIX
     11TARGET_PLATFORM         = unix
    1112TEMPLATE                = app
    1213CONFIG                  += qt warn_on release link_prl
    … …  
    5758QMAKE_LFLAGS_SONAME     = -h$$LITERAL_WHITESPACE
    5859QMAKE_LFLAGS_THREAD     = -Kthread
    59 QMAKE_RPATH             = -R
     60QMAKE_LFLAGS_RPATH      = -R
    6061
    6162QMAKE_LIBS              =

  • trunk/mkspecs/unixware-cc/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)
    … …  
    7777#endif
    7878
    79 #define QT_FOPEN                ::fopen
    80 #define QT_FSEEK                ::fseek
    81 #define QT_FTELL                ::ftell
    82 #define QT_FGETPOS              ::fgetpos
    83 #define QT_FSETPOS              ::fsetpos
    84 #define QT_MMAP                 ::mmap
    85 #define QT_FPOS_T               fpos_t
     79#define QT_NO_USE_FSEEKO
     80#include "../common/posix/qplatformdefs.h"
     81
     82#undef QT_OFF_T
     83#undef QT_SOCKLEN_T
     84
    8685#define QT_OFF_T                off_t
    87 
    88 #define QT_STATBUF              struct stat
    89 #define QT_STATBUF4TSTAT        struct stat
    90 #define QT_STAT                 ::stat
    91 #define QT_FSTAT                ::fstat
    92 #define QT_LSTAT                ::lstat
    93 #define QT_STAT_REG             S_IFREG
    94 #define QT_STAT_DIR             S_IFDIR
    95 #define QT_STAT_MASK            S_IFMT
    96 #define QT_STAT_LNK             S_IFLNK
    97 #define QT_SOCKET_CONNECT       ::connect
    98 #define QT_SOCKET_BIND          ::bind
    99 #define QT_FILENO               fileno
    100 #define QT_OPEN                 ::open
    101 #define QT_CLOSE                ::close
    102 #define QT_TRUNCATE             ::truncate
    103 #define QT_FTRUNCATE            ::ftruncate
    104 #define QT_LSEEK                ::lseek
    105 #define QT_READ                 ::read
    106 #define QT_WRITE                ::write
    107 #define QT_ACCESS               ::access
    108 #define QT_GETCWD               ::getcwd
    109 #define QT_CHDIR                ::chdir
    110 #define QT_MKDIR                ::mkdir
    111 #define QT_RMDIR                ::rmdir
    112 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    113 #define QT_OPEN_RDONLY          O_RDONLY
    114 #define QT_OPEN_WRONLY          O_WRONLY
    115 #define QT_OPEN_RDWR            O_RDWR
    116 #define QT_OPEN_CREAT           O_CREAT
    117 #define QT_OPEN_TRUNC           O_TRUNC
    118 #define QT_OPEN_APPEND          O_APPEND
    119 
    120 #define QT_SIGNAL_RETTYPE       void
    121 #define QT_SIGNAL_ARGS          int
    122 #define QT_SIGNAL_IGNORE        SIG_IGN
    123 
    124 #define QT_SOCKLEN_T            size_t
     86#define QT_SOCKLEN_T            size_t
    12587
    12688#define QT_SNPRINTF             ::snprintf
    12789#define QT_VSNPRINTF            ::vsnprintf
    12890
    129 
    13091#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/unixware-g++/qmake.conf

    r2 r846  
    66
    77MAKEFILE_GENERATOR      = UNIX
     8TARGET_PLATFORM         = unix
    89TEMPLATE                = app
    910CONFIG                  += qt warn_on release link_prl
    … …  
    5859QMAKE_LFLAGS_SONAME     =
    5960QMAKE_LFLAGS_THREAD     =
    60 QMAKE_RPATH             = -Wl,-R,
     61QMAKE_LFLAGS_RPATH      = -Wl,-R,
    6162
    6263QMAKE_LIBS              =

  • trunk/mkspecs/unixware-g++/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)
    … …  
    7777#endif
    7878
    79 #define QT_FOPEN                ::fopen
    80 #define QT_FSEEK                ::fseek
    81 #define QT_FTELL                ::ftell
    82 #define QT_FGETPOS              ::fgetpos
    83 #define QT_FSETPOS              ::fsetpos
    84 #define QT_MMAP                 ::mmap
    85 #define QT_FPOS_T               fpos_t
     79#define QT_NO_USE_FSEEKO
     80#include "../common/posix/qplatformdefs.h"
     81
     82#undef QT_OFF_T
     83#undef QT_SOCKLEN_T
     84
    8685#define QT_OFF_T                off_t
    87 
    88 #define QT_STATBUF              struct stat
    89 #define QT_STATBUF4TSTAT        struct stat
    90 #define QT_STAT                 ::stat
    91 #define QT_FSTAT                ::fstat
    92 #define QT_LSTAT                ::lstat
    93 #define QT_STAT_REG             S_IFREG
    94 #define QT_STAT_DIR             S_IFDIR
    95 #define QT_STAT_MASK            S_IFMT
    96 #define QT_STAT_LNK             S_IFLNK
    97 #define QT_SOCKET_CONNECT       ::connect
    98 #define QT_SOCKET_BIND          ::bind
    99 #define QT_FILENO               fileno
    100 #define QT_OPEN                 ::open
    101 #define QT_CLOSE                ::close
    102 #define QT_TRUNCATE             ::truncate
    103 #define QT_FTRUNCATE            ::ftruncate
    104 #define QT_LSEEK                ::lseek
    105 #define QT_READ                 ::read
    106 #define QT_WRITE                ::write
    107 #define QT_ACCESS               ::access
    108 #define QT_GETCWD               ::getcwd
    109 #define QT_CHDIR                ::chdir
    110 #define QT_MKDIR                ::mkdir
    111 #define QT_RMDIR                ::rmdir
    112 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    113 #define QT_OPEN_RDONLY          O_RDONLY
    114 #define QT_OPEN_WRONLY          O_WRONLY
    115 #define QT_OPEN_RDWR            O_RDWR
    116 #define QT_OPEN_CREAT           O_CREAT
    117 #define QT_OPEN_TRUNC           O_TRUNC
    118 #define QT_OPEN_APPEND          O_APPEND
    119 
    120 #define QT_SIGNAL_RETTYPE       void
    121 #define QT_SIGNAL_ARGS          int
    122 #define QT_SIGNAL_IGNORE        SIG_IGN
    123 
    124 #define QT_SOCKLEN_T            size_t
     86#define QT_SOCKLEN_T            size_t
    12587
    12688#define QT_SNPRINTF             ::snprintf
    12789#define QT_VSNPRINTF            ::vsnprintf
    12890
    129 
    13091#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/unsupported/linux-host-g++/qmake.conf

    r561 r846  
    6464QMAKE_LFLAGS_THREAD     +=
    6565QMAKE_LFLAGS_NOUNDEF    += -Wl,--no-undefined
    66 QMAKE_RPATH             = -Wl,-rpath,
     66QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
    6767
    6868QMAKE_PCH_OUTPUT_EXT    = .gch
    … …  
    8989QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
    9090QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
    91 QMAKE_INCDIR_OPENGL_ES1CL = $$QMAKE_INCDIR_OPENGL
    92 QMAKE_LIBDIR_OPENGL_ES1CL = $$QMAKE_LIBDIR_OPENGL
    9391QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
    9492QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
    … …  
    107105QMAKE_LIBS_OPENGL_QT  = -lGL
    108106QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM
    109 QMAKE_LIBS_OPENGL_ES1CL = -lGLES_CL
    110107QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
    111108QMAKE_LIBS_OPENVG     = -lOpenVG

  • trunk/mkspecs/unsupported/linux-host-g++/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)

  • trunk/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf

    r561 r846  
    1313
    1414MAKEFILE_GENERATOR      = UNIX
     15TARGET_PLATFORM         = unix
    1516TEMPLATE                = app
    1617CONFIG                  += qt warn_on release incremental link_prl

  • trunk/mkspecs/unsupported/linux-scratchbox2-g++/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)

  • trunk/mkspecs/unsupported/qnx-g++/qmake.conf

    r561 r846  
    66
    77MAKEFILE_GENERATOR      = UNIX
     8TARGET_PLATFORM         = unix
    89TEMPLATE                = app
    910CONFIG                  += qt warn_on release link_prl

  • trunk/mkspecs/unsupported/qnx-g++/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)
    … …  
    8282#include <arpa/inet.h>
    8383
    84 #ifdef QT_LARGEFILE_SUPPORT
    85 #define QT_FOPEN                ::fopen64
    86 #define QT_FSEEK                ::fseeko64
    87 #define QT_FTELL                ::ftello64
    88 #define QT_FGETPOS              ::fgetpos64
    89 #define QT_FSETPOS              ::fsetpos64
    90 #define QT_MMAP                 ::mmap64
    91 #define QT_FPOS_T               fpos64_t
    92 #define QT_OFF_T                off64_t
    93 #else
    94 #define QT_FOPEN                ::fopen
    95 #define QT_FSEEK                ::fseeko
    96 #define QT_FTELL                ::ftello
    97 #define QT_FGETPOS              ::fgetpos
    98 #define QT_FSETPOS              ::fsetpos
    99 #define QT_MMAP                 ::mmap
    100 #define QT_FPOS_T               fpos_t
    101 #define QT_OFF_T                off_t
    102 #endif
    103 
    104 #ifdef QT_LARGEFILE_SUPPORT
    105 #define QT_STATBUF              struct stat64
    106 #define QT_STATBUF4TSTAT        struct stat64
    107 #define QT_STAT                 ::stat64
    108 #define QT_FSTAT                ::fstat64
    109 #define QT_LSTAT                ::lstat64
    110 #define QT_OPEN                 ::open64
    111 #define QT_TRUNCATE             ::truncate64
    112 #define QT_FTRUNCATE            ::ftruncate64
    113 #define QT_LSEEK                ::lseek64
    114 #else
    115 #define QT_STATBUF              struct stat
    116 #define QT_STATBUF4TSTAT        struct stat
    117 #define QT_STAT                 ::stat
    118 #define QT_FSTAT                ::fstat
    119 #define QT_LSTAT                ::lstat
    120 #define QT_OPEN                 ::open
    121 #define QT_TRUNCATE             ::truncate
    122 #define QT_FTRUNCATE            ::ftruncate
    123 #define QT_LSEEK                ::lseek
    124 #endif
    125 
    126 #define QT_STAT_REG             S_IFREG
    127 #define QT_STAT_DIR             S_IFDIR
    128 #define QT_STAT_MASK            S_IFMT
    129 #define QT_STAT_LNK             S_IFLNK
    130 #define QT_SOCKET_CONNECT       ::connect
    131 #define QT_SOCKET_BIND          ::bind
    132 #define QT_FILENO               fileno
    133 #define QT_CLOSE                ::close
    134 #define QT_READ                 ::read
    135 #define QT_WRITE                ::write
    136 #define QT_ACCESS               ::access
    137 #define QT_GETCWD               ::getcwd
    138 #define QT_CHDIR                ::chdir
    139 #define QT_MKDIR                ::mkdir
    140 #define QT_RMDIR                ::rmdir
    141 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    142 #define QT_OPEN_RDONLY          O_RDONLY
    143 #define QT_OPEN_WRONLY          O_WRONLY
    144 #define QT_OPEN_RDWR            O_RDWR
    145 #define QT_OPEN_CREAT           O_CREAT
    146 #define QT_OPEN_TRUNC           O_TRUNC
    147 #define QT_OPEN_APPEND          O_APPEND
    148 
    149 #define QT_SIGNAL_RETTYPE       void
    150 #define QT_SIGNAL_ARGS          int
    151 #define QT_SIGNAL_IGNORE        SIG_IGN
    152 
    153 #define QT_SOCKLEN_T            socklen_t
     84#define QT_USE_XOPEN_LFS_EXTENSIONS
     85#include "../../common/posix/qplatformdefs.h"
    15486
    15587#define QT_SNPRINTF             ::snprintf

  • trunk/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf

    r561 r846  
    66
    77MAKEFILE_GENERATOR      = UNIX
     8TARGET_PLATFORM         = unix
    89TEMPLATE                = app
    910CONFIG                  += qt warn_on release link_prl
    … …  
    5354QMAKE_LFLAGS_SONAME     += -Wl,-soname,
    5455QMAKE_LFLAGS_THREAD     +=
    55 QMAKE_RPATH             = -Wl,-rpath,
     56QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
    5657
    5758QMAKE_PCH_OUTPUT_EXT    = .gch

  • trunk/mkspecs/unsupported/qws/qnx-generic-g++/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)

  • trunk/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf

    r561 r846  
    66
    77MAKEFILE_GENERATOR      = UNIX
     8TARGET_PLATFORM         = unix
    89TEMPLATE                = app
    910CONFIG                  += qt warn_on release link_prl
    … …  
    4950QMAKE_LFLAGS_SONAME     += -Wl,-soname,
    5051QMAKE_LFLAGS_THREAD     +=
    51 QMAKE_RPATH             = -Wl,-rpath,
     52QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
    5253
    5354QMAKE_PCH_OUTPUT_EXT    = .gch

  • trunk/mkspecs/unsupported/qws/qnx-i386-g++/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)

  • trunk/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf

    r561 r846  
    66
    77MAKEFILE_GENERATOR      = UNIX
     8TARGET_PLATFORM         = unix
    89TEMPLATE                = app
    910CONFIG                  += qt warn_on release link_prl
    … …  
    4950QMAKE_LFLAGS_SONAME     += -Wl,-soname,
    5051QMAKE_LFLAGS_THREAD     +=
    51 QMAKE_RPATH             = -Wl,-rpath,
     52QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
    5253
    5354QMAKE_PCH_OUTPUT_EXT    = .gch

  • trunk/mkspecs/unsupported/qws/qnx-ppc-g++/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)

  • trunk/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf

    r561 r846  
    44
    55MAKEFILE_GENERATOR  = UNIX
     6TARGET_PLATFORM     = unix
    67TEMPLATE            = app
    78CONFIG             += qt warn_on release incremental link_prl vxworks
    … …  
    5354QMAKE_LFLAGS_THREAD     +=
    5455QMAKE_LFLAGS_NOUNDEF    +=
    55 QMAKE_RPATH             =
     56QMAKE_LFLAGS_RPATH      =
    5657
    5758QMAKE_PCH_OUTPUT_EXT    = .gch

  • trunk/mkspecs/unsupported/vxworks-ppc-dcc/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)

  • trunk/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf

    r561 r846  
    44
    55MAKEFILE_GENERATOR  = UNIX
     6TARGET_PLATFORM     = unix
    67TEMPLATE            = app
    78CONFIG             += qt warn_on release incremental link_prl vxworks

  • trunk/mkspecs/unsupported/vxworks-ppc-g++/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)

  • trunk/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf

    r561 r846  
    44
    55MAKEFILE_GENERATOR  = UNIX
     6TARGET_PLATFORM     = unix
    67TEMPLATE            = app
    78CONFIG             += qt warn_on release incremental link_prl vxworks
    … …  
    5354QMAKE_LFLAGS_THREAD     +=
    5455QMAKE_LFLAGS_NOUNDEF    +=
    55 QMAKE_RPATH             =
     56QMAKE_LFLAGS_RPATH      =
    5657
    5758QMAKE_PCH_OUTPUT_EXT    = .gch

  • trunk/mkspecs/unsupported/vxworks-simpentium-dcc/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)

  • trunk/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf

    r561 r846  
    44
    55MAKEFILE_GENERATOR  = UNIX
     6TARGET_PLATFORM     = unix
    67TEMPLATE            = app
    78CONFIG             += qt warn_on release incremental link_prl vxworks

  • trunk/mkspecs/unsupported/vxworks-simpentium-g++/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)
    … …  
    4848#include "qfunctions_vxworks.h"
    4949
     50#define QT_USE_XOPEN_LFS_EXTENSIONS
     51#include "../../common/posix/qplatformdefs.h"
    5052
    51 #ifdef QT_LARGEFILE_SUPPORT
    52 #define QT_STATBUF              struct stat64
    53 #define QT_STATBUF4TSTAT        struct stat64
    54 #define QT_STAT                 ::stat64
    55 #define QT_FSTAT                ::fstat64
    56 #define QT_LSTAT                ::stat64
    57 #define QT_OPEN                 ::open64
    58 #define QT_TRUNCATE             ::truncate64
    59 #define QT_FTRUNCATE            ::ftruncate64
    60 #define QT_LSEEK                ::lseek64
    61 #else
    62 #define QT_STATBUF              struct stat
    63 #define QT_STATBUF4TSTAT        struct stat
    64 #define QT_STAT                 ::stat
    65 #define QT_FSTAT                ::fstat
    66 #define QT_LSTAT                ::stat
    67 #define QT_OPEN                 ::open
    68 #define QT_TRUNCATE             ::truncate
    69 #define QT_FTRUNCATE            ::ftruncate
    70 #define QT_LSEEK                ::lseek
    71 #endif
     53#undef QT_LSTAT
     54#undef QT_MKDIR
     55#undef QT_READ
     56#undef QT_WRITE
     57#undef QT_SOCKLEN_T
     58#undef QT_SOCKET_CONNECT
    7259
    73 #ifdef QT_LARGEFILE_SUPPORT
    74 #define QT_FOPEN                ::fopen64
    75 #define QT_FSEEK                ::fseeko64
    76 #define QT_FTELL                ::ftello64
    77 #define QT_FGETPOS              ::fgetpos64
    78 #define QT_FSETPOS              ::fsetpos64
    79 #define QT_MMAP                 ::mmap64
    80 #define QT_FPOS_T               fpos64_t
    81 #define QT_OFF_T                off64_t
    82 #else
    83 #define QT_FOPEN                ::fopen
    84 #define QT_FSEEK                ::fseek
    85 #define QT_FTELL                ::ftell
    86 #define QT_FGETPOS              ::fgetpos
    87 #define QT_FSETPOS              ::fsetpos
    88 #define QT_MMAP                 ::mmap
    89 #define QT_FPOS_T               fpos_t
    90 #define QT_OFF_T                long
    91 #endif
     60#define QT_LSTAT                QT_STAT
     61#define QT_MKDIR(dir, perm)     ::mkdir(dir)
    9262
    93 #define QT_STAT_REG             S_IFREG
    94 #define QT_STAT_DIR             S_IFDIR
    95 #define QT_STAT_MASK            S_IFMT
    96 #define QT_STAT_LNK             S_IFLNK
    97 #define QT_SOCKET_CONNECT(sd, to, tolen) \
    98                                 ::connect(sd, (struct sockaddr *) to, tolen)
    99 #define QT_SOCKET_BIND          ::bind
    100 #define QT_FILENO               fileno
    101 #define QT_CLOSE                ::close
    10263#define QT_READ(fd, buf, len)   ::read(fd, (char*) buf, len)
    10364#define QT_WRITE(fd, buf, len)  ::write(fd, (char*) buf, len)
    104 #define QT_ACCESS               ::access
    105 #define QT_GETCWD               ::getcwd
    106 #define QT_CHDIR                ::chdir
    107 #define QT_MKDIR(dir, perm)     ::mkdir(dir)
    108 #define QT_RMDIR                ::rmdir
    109 #define QT_OPEN_LARGEFILE       O_LARGEFILE
    110 #define QT_OPEN_RDONLY          O_RDONLY
    111 #define QT_OPEN_WRONLY          O_WRONLY
    112 #define QT_OPEN_RDWR            O_RDWR
    113 #define QT_OPEN_CREAT           O_CREAT
    114 #define QT_OPEN_TRUNC           O_TRUNC
    115 #define QT_OPEN_APPEND          O_APPEND
    116 
    117 #define QT_SIGNAL_RETTYPE       void
    118 #define QT_SIGNAL_ARGS          int
    119 #define QT_SIGNAL_IGNORE        SIG_IGN
    12065
    12166// there IS a socklen_t in sys/socket.h (unsigned int),
    12267// but sockLib.h uses int in all function declaration...
    123 //#define QT_SOCKLEN_T            socklen_t
    12468#define QT_SOCKLEN_T            int
     69#define QT_SOCKET_CONNECT(sd, to, tolen) \
     70                                ::connect(sd, (struct sockaddr *) to, tolen)
    12571
    12672#define QT_SNPRINTF             ::snprintf
    12773#define QT_VSNPRINTF            ::vsnprintf
    12874
    129 
    13075#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/win32-borland/qmake.conf

    r2 r846  
    4242
    4343QMAKE_INCDIR            =
    44 QMAKE_LIBDIR            = $(BCB)\lib
     44QMAKE_LIBDIR            = $(BCB)\\lib
    4545QMAKE_INCDIR_QT         = $$[QT_INSTALL_HEADERS]
    4646QMAKE_LIBDIR_QT         = $$[QT_INSTALL_LIBS]
    … …  
    7070#QMAKE_LFLAGS_OPENGL    = /dopengl32.dll
    7171
    72 QMAKE_MOC               = $$[QT_INSTALL_BINS]\moc.exe
    73 QMAKE_UIC               = $$[QT_INSTALL_BINS]\uic.exe
    74 QMAKE_IDC               = $$[QT_INSTALL_BINS]\idc.exe
     72QMAKE_MOC               = $$[QT_INSTALL_BINS]\\moc.exe
     73QMAKE_UIC               = $$[QT_INSTALL_BINS]\\uic.exe
     74QMAKE_IDC               = $$[QT_INSTALL_BINS]\\idc.exe
    7575
    7676QMAKE_IDL               = midl

  • trunk/mkspecs/win32-borland/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)
    … …  
    9797#endif
    9898
    99 #define QT_FOPEN                ::fopen
     99#include "../common/c89/qplatformdefs.h"
     100
    100101#ifdef QT_LARGEFILE_SUPPORT
     102#undef QT_FSEEK
     103#undef QT_FTELL
     104#undef QT_OFF_T
     105
    101106#define QT_FSEEK                ::_fseeki64
    102107#define QT_FTELL                ::_ftelli64
    103 #else
    104 #define QT_FSEEK                ::fseek
    105 #define QT_FTELL                ::ftell
    106 #endif
    107 #define QT_FGETPOS              ::fgetpos
    108 #define QT_FSETPOS              ::fsetpos
    109 #define QT_FPOS_T               fpos_t
    110 #ifdef QT_LARGEFILE_SUPPORT
    111108#define QT_OFF_T                __int64
    112 #else
    113 #define QT_OFF_T                long
    114109#endif
    115110

  • trunk/mkspecs/win32-g++/qmake.conf

    r769 r846  
    6969QMAKE_LIBS_GUI          = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lws2_32 -lole32 -luuid -luser32 -ladvapi32
    7070QMAKE_LIBS_NETWORK      = -lws2_32
    71 QMAKE_LIBS_OPENGL       = -lopengl32 -lglu32 -lgdi32 -luser32
     71QMAKE_LIBS_OPENGL       = -lglu32 -lopengl32 -lgdi32 -luser32
    7272QMAKE_LIBS_COMPAT       = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
    7373QMAKE_LIBS_QT_ENTRY     = -lmingw32 -lqtmain

  • trunk/mkspecs/win32-g++/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)
    … …  
    134134#endif
    135135
    136 #define QT_FOPEN                ::fopen
     136#include "../common/c89/qplatformdefs.h"
     137
    137138#ifdef QT_LARGEFILE_SUPPORT
     139#undef QT_FSEEK
     140#undef QT_FTELL
     141#undef QT_OFF_T
     142
    138143#define QT_FSEEK                ::fseeko64
    139144#define QT_FTELL                ::ftello64
    140 #else
    141 #define QT_FSEEK                ::fseek
    142 #define QT_FTELL                ::ftell
    143 #endif
    144 #define QT_FGETPOS              ::fgetpos
    145 #define QT_FSETPOS              ::fsetpos
    146 #define QT_FPOS_T               fpos_t
    147 #ifdef QT_LARGEFILE_SUPPORT
    148145#define QT_OFF_T                off64_t
    149 #else
    150 #define QT_OFF_T                long
    151146#endif
    152147

  • trunk/mkspecs/win32-icc/qmake.conf

    r561 r846  
    55#
    66
    7 MAKEFILE_GENERATOR      = MSVC
     7MAKEFILE_GENERATOR      = MSVC.NET
    88TEMPLATE                = app
    99CONFIG                  += qt warn_on release incremental flat link_prl copy_dir_files debug_and_release debug_and_release_target
    … …  
    5151QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<<
    5252
    53 QMAKE_LINK              = link
     53QMAKE_LINK              = xilink
    5454QMAKE_LFLAGS            = /NOLOGO
    5555QMAKE_LFLAGS_RELEASE    =
    … …  
    6464QMAKE_LIBS_GUI          = gdi32.lib comdlg32.lib oleaut32.lib imm32.lib winmm.lib winspool.lib ws2_32.lib ole32.lib user32.lib advapi32.lib
    6565QMAKE_LIBS_NETWORK      = ws2_32.lib
    66 QMAKE_LIBS_OPENGL       = opengl32.lib glu32.lib gdi32.lib user32.lib delayimp.lib
     66QMAKE_LIBS_OPENGL       = glu32.lib opengl32.lib gdi32.lib user32.lib delayimp.lib
    6767QMAKE_LIBS_COMPAT       = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32.lib ws2_32.lib
    6868QMAKE_LIBS_QT_ENTRY     = -lqtmain
    6969
    70 QMAKE_MOC               = $$[QT_INSTALL_BINS]\moc.exe
    71 QMAKE_UIC               = $$[QT_INSTALL_BINS]\uic.exe
    72 QMAKE_IDC               = $$[QT_INSTALL_BINS]\idc.exe
     70QMAKE_MOC               = $$[QT_INSTALL_BINS]\\moc.exe
     71QMAKE_UIC               = $$[QT_INSTALL_BINS]\\uic.exe
     72QMAKE_IDC               = $$[QT_INSTALL_BINS]\\idc.exe
    7373
    7474QMAKE_IDL               = midl
    75 QMAKE_LIB               = lib /NOLOGO
     75QMAKE_LIB               = xilib /NOLOGO
    7676QMAKE_RC                = rc
    7777

  • trunk/mkspecs/win32-icc/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)
    … …  
    114114#endif
    115115
    116 #define QT_FOPEN                ::fopen
     116#include "../common/c89/qplatformdefs.h"
     117
    117118#if defined(QT_LARGEFILE_SUPPORT) && _MSC_VER > 1310
     119#undef QT_FSEEK
     120#undef QT_FTELL
     121
    118122#define QT_FSEEK                ::_fseeki64
    119123#define QT_FTELL                ::_ftelli64
    120 #else
    121 #define QT_FSEEK                ::fseek
    122 #define QT_FTELL                ::ftell
    123124#endif
    124 #define QT_FGETPOS              ::fgetpos
    125 #define QT_FSETPOS              ::fsetpos
    126 #define QT_FPOS_T               fpos_t
    127 #ifdef QT_LARGEFILE_SUPPORT
     125
     126#if defined(QT_LARGEFILE_SUPPORT)
     127#undef QT_OFF_T
    128128#define QT_OFF_T                __int64
    129 #else
    130 #define QT_OFF_T                long
    131129#endif
    132130

  • trunk/mkspecs/win32-msvc2003/qmake.conf

    r2 r846  
    2121QMAKE_CFLAGS_WARN_OFF   = -W0
    2222QMAKE_CFLAGS_RELEASE    = -O2 -MD
     23QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MD -Zi
    2324QMAKE_CFLAGS_DEBUG      = -Zi -MDd
    2425QMAKE_CFLAGS_YACC       =
    … …  
    2930QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
    3031QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
     32QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
    3133QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
    3234QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
    … …  
    5254QMAKE_LFLAGS            = /NOLOGO
    5355QMAKE_LFLAGS_RELEASE    = /INCREMENTAL:NO
     56QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /DEBUG /OPT:REF
    5457QMAKE_LFLAGS_DEBUG      = /DEBUG
    5558QMAKE_LFLAGS_CONSOLE    = /SUBSYSTEM:CONSOLE
    … …  
    6063QMAKE_LIBS_GUI          = gdi32.lib comdlg32.lib oleaut32.lib imm32.lib winmm.lib winspool.lib ws2_32.lib ole32.lib user32.lib advapi32.lib
    6164QMAKE_LIBS_NETWORK      = ws2_32.lib
    62 QMAKE_LIBS_OPENGL       = opengl32.lib glu32.lib gdi32.lib user32.lib
     65QMAKE_LIBS_OPENGL       = glu32.lib opengl32.lib gdi32.lib user32.lib
    6366QMAKE_LIBS_COMPAT       = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32.lib ws2_32.lib
    6467
    6568QMAKE_LIBS_QT_ENTRY     = -lqtmain
    6669
    67 QMAKE_MOC               = $$[QT_INSTALL_BINS]\moc.exe
    68 QMAKE_UIC               = $$[QT_INSTALL_BINS]\uic.exe
    69 QMAKE_IDC               = $$[QT_INSTALL_BINS]\idc.exe
     70QMAKE_MOC               = $$[QT_INSTALL_BINS]\\moc.exe
     71QMAKE_UIC               = $$[QT_INSTALL_BINS]\\uic.exe
     72QMAKE_IDC               = $$[QT_INSTALL_BINS]\\idc.exe
    7073
    7174QMAKE_IDL               = midl

  • trunk/mkspecs/win32-msvc2003/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)
    … …  
    4040****************************************************************************/
    4141
    42 #include "../win32-msvc.net/qplatformdefs.h"
     42#ifndef QPLATFORMDEFS_H
     43#define QPLATFORMDEFS_H
     44
     45#ifdef UNICODE
     46#ifndef _UNICODE
     47#define _UNICODE
     48#endif
     49#endif
     50
     51// Get Qt defines/settings
     52
     53#include "qglobal.h"
     54
     55#define _POSIX_
     56#include <limits.h>
     57#undef _POSIX_
     58
     59#include <tchar.h>
     60#include <io.h>
     61#include <direct.h>
     62#include <stdio.h>
     63#include <fcntl.h>
     64#include <errno.h>
     65#include <sys/stat.h>
     66#include <stdlib.h>
     67#include <windows.h>
     68
     69#define Q_FS_FAT
     70#ifdef QT_LARGEFILE_SUPPORT
     71#define QT_STATBUF              struct _stati64         // non-ANSI defs
     72#define QT_STATBUF4TSTAT        struct _stati64         // non-ANSI defs
     73#define QT_STAT                 ::_stati64
     74#define QT_FSTAT                ::_fstati64
     75#else
     76#define QT_STATBUF              struct _stat            // non-ANSI defs
     77#define QT_STATBUF4TSTAT        struct _stat            // non-ANSI defs
     78#define QT_STAT                 ::_stat
     79#define QT_FSTAT                ::_fstat
     80#endif
     81#define QT_STAT_REG             _S_IFREG
     82#define QT_STAT_DIR             _S_IFDIR
     83#define QT_STAT_MASK            _S_IFMT
     84#if defined(_S_IFLNK)
     85#  define QT_STAT_LNK           _S_IFLNK
     86#endif
     87#define QT_FILENO               _fileno
     88#define QT_OPEN                 ::_open
     89#define QT_CLOSE                ::_close
     90#ifdef QT_LARGEFILE_SUPPORT
     91#define QT_LSEEK                ::_lseeki64
     92#define QT_TSTAT                ::_tstati64
     93#else
     94#define QT_LSEEK                ::_lseek
     95#define QT_TSTAT                ::_tstat
     96#endif
     97#define QT_READ                 ::_read
     98#define QT_WRITE                ::_write
     99#define QT_ACCESS               ::_access
     100#define QT_GETCWD               ::_getcwd
     101#define QT_CHDIR                ::_chdir
     102#define QT_MKDIR                ::_mkdir
     103#define QT_RMDIR                ::_rmdir
     104#define QT_OPEN_LARGEFILE       0
     105#define QT_OPEN_RDONLY          _O_RDONLY
     106#define QT_OPEN_WRONLY          _O_WRONLY
     107#define QT_OPEN_RDWR            _O_RDWR
     108#define QT_OPEN_CREAT           _O_CREAT
     109#define QT_OPEN_TRUNC           _O_TRUNC
     110#define QT_OPEN_APPEND          _O_APPEND
     111#if defined(O_TEXT)
     112# define QT_OPEN_TEXT           _O_TEXT
     113# define QT_OPEN_BINARY         _O_BINARY
     114#endif
     115
     116#include "../common/c89/qplatformdefs.h"
     117
     118#ifdef QT_LARGEFILE_SUPPORT
     119#undef QT_FTELL
     120#undef QT_OFF_T
     121
     122// 64-bit versions of fseek/ftell not always available. E.g., when linking
     123// dynamically to CRT (/MT)
     124#define QT_FTELL                (QT_OFF_T)::ftell
     125#define QT_OFF_T                __int64
     126#endif
     127
     128#define QT_SIGNAL_ARGS          int
     129
     130#define QT_VSNPRINTF ::_vsnprintf
     131#define QT_SNPRINTF             ::_snprintf
     132
     133# define F_OK   0
     134# define X_OK   1
     135# define W_OK   2
     136# define R_OK   4
     137
     138typedef int mode_t;
     139
     140#endif // QPLATFORMDEFS_H

  • trunk/mkspecs/win32-msvc2005/qmake.conf

    r561 r846  
    2121QMAKE_CFLAGS_WARN_OFF   = -W0
    2222QMAKE_CFLAGS_RELEASE    = -O2 -MD
     23QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MD -Zi
    2324QMAKE_CFLAGS_DEBUG      = -Zi -MDd
    2425QMAKE_CFLAGS_YACC       =
    … …  
    3031QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
    3132QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
     33QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
    3234QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
    3335QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
    … …  
    5456QMAKE_LFLAGS            = /NOLOGO
    5557QMAKE_LFLAGS_RELEASE    = /INCREMENTAL:NO
     58QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /DEBUG /OPT:REF
    5659QMAKE_LFLAGS_DEBUG      = /DEBUG
    5760QMAKE_LFLAGS_CONSOLE    = /SUBSYSTEM:CONSOLE
    … …  
    6366QMAKE_LIBS_GUI          = gdi32.lib comdlg32.lib oleaut32.lib imm32.lib winmm.lib winspool.lib ws2_32.lib ole32.lib user32.lib advapi32.lib
    6467QMAKE_LIBS_NETWORK      = ws2_32.lib
    65 QMAKE_LIBS_OPENGL       = opengl32.lib glu32.lib gdi32.lib user32.lib
     68QMAKE_LIBS_OPENGL       = glu32.lib opengl32.lib gdi32.lib user32.lib
    6669QMAKE_LIBS_COMPAT       = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32.lib ws2_32.lib
    6770
    6871QMAKE_LIBS_QT_ENTRY     = -lqtmain
    6972
    70 QMAKE_MOC               = $$[QT_INSTALL_BINS]\moc.exe
    71 QMAKE_UIC               = $$[QT_INSTALL_BINS]\uic.exe
    72 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
    7376
    7477QMAKE_IDL               = midl

  • trunk/mkspecs/win32-msvc2005/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)
    … …  
    114114#endif
    115115
    116 #define QT_FOPEN                ::fopen
     116#include "../common/c89/qplatformdefs.h"
     117
    117118#ifdef QT_LARGEFILE_SUPPORT
     119#undef QT_FSEEK
     120#undef QT_FTELL
     121#undef QT_OFF_T
     122
    118123#define QT_FSEEK                ::_fseeki64
    119124#define QT_FTELL                ::_ftelli64
    120 #else
    121 #define QT_FSEEK                ::fseek
    122 #define QT_FTELL                ::ftell
    123 #endif
    124 #define QT_FGETPOS              ::fgetpos
    125 #define QT_FSETPOS              ::fsetpos
    126 #define QT_FPOS_T               fpos_t
    127 #ifdef QT_LARGEFILE_SUPPORT
    128125#define QT_OFF_T                __int64
    129 #else
    130 #define QT_OFF_T                long
    131126#endif
    132127

  • trunk/mkspecs/win32-msvc2008/qmake.conf

    r561 r846  
    2121QMAKE_CFLAGS_WARN_OFF   = -W0
    2222QMAKE_CFLAGS_RELEASE    = -O2 -MD
     23QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MD -Zi
    2324QMAKE_CFLAGS_DEBUG      = -Zi -MDd
    2425QMAKE_CFLAGS_YACC       =
    2526QMAKE_CFLAGS_LTCG       = -GL
     27QMAKE_CFLAGS_MP         = -MP
    2628
    2729QMAKE_CXX               = $$QMAKE_CC
    … …  
    3032QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
    3133QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
     34QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
    3235QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
    3336QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
    3437QMAKE_CXXFLAGS_LTCG     = $$QMAKE_CFLAGS_LTCG
     38QMAKE_CXXFLAGS_MP       = $$QMAKE_CFLAGS_MP
    3539QMAKE_CXXFLAGS_STL_ON   = -EHsc
    3640QMAKE_CXXFLAGS_STL_OFF  =
    … …  
    5458QMAKE_LFLAGS            = /NOLOGO
    5559QMAKE_LFLAGS_RELEASE    = /INCREMENTAL:NO
     60QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /DEBUG /OPT:REF
    5661QMAKE_LFLAGS_DEBUG      = /DEBUG
    5762QMAKE_LFLAGS_CONSOLE    = /SUBSYSTEM:CONSOLE
    … …  
    6368QMAKE_LIBS_GUI          = gdi32.lib comdlg32.lib oleaut32.lib imm32.lib winmm.lib winspool.lib ws2_32.lib ole32.lib user32.lib advapi32.lib
    6469QMAKE_LIBS_NETWORK      = ws2_32.lib
    65 QMAKE_LIBS_OPENGL       = opengl32.lib glu32.lib gdi32.lib user32.lib
     70QMAKE_LIBS_OPENGL       = glu32.lib opengl32.lib gdi32.lib user32.lib
    6671QMAKE_LIBS_COMPAT       = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32.lib ws2_32.lib
    6772
    6873QMAKE_LIBS_QT_ENTRY     = -lqtmain
    6974
    70 QMAKE_MOC               = $$[QT_INSTALL_BINS]\moc.exe
    71 QMAKE_UIC               = $$[QT_INSTALL_BINS]\uic.exe
    72 QMAKE_IDC               = $$[QT_INSTALL_BINS]\idc.exe
     75QMAKE_MOC               = $$[QT_INSTALL_BINS]\\moc.exe
     76QMAKE_UIC               = $$[QT_INSTALL_BINS]\\uic.exe
     77QMAKE_IDC               = $$[QT_INSTALL_BINS]\\idc.exe
    7378
    7479QMAKE_IDL               = midl

  • trunk/mkspecs/win32-msvc2008/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)

  • trunk/mkspecs/wince50standard-armv4i-msvc2005/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)

  • trunk/mkspecs/wince50standard-armv4i-msvc2008/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)

  • trunk/mkspecs/wince50standard-mipsii-msvc2005/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)

  • trunk/mkspecs/wince50standard-mipsii-msvc2008/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)

  • trunk/mkspecs/wince50standard-mipsiv-msvc2005/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)

  • trunk/mkspecs/wince50standard-mipsiv-msvc2008/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)

  • trunk/mkspecs/wince50standard-sh4-msvc2005/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)

  • trunk/mkspecs/wince50standard-sh4-msvc2008/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)

  • trunk/mkspecs/wince50standard-x86-msvc2005/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)

  • trunk/mkspecs/wince50standard-x86-msvc2008/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)

  • trunk/mkspecs/wince60standard-armv4i-msvc2005/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)

  • trunk/mkspecs/wince60standard-x86-msvc2005/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)

  • trunk/mkspecs/wincewm50pocket-msvc2005/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)

  • trunk/mkspecs/wincewm50pocket-msvc2008/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)

  • trunk/mkspecs/wincewm50smart-msvc2005/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)

  • trunk/mkspecs/wincewm50smart-msvc2008/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)

  • trunk/mkspecs/wincewm60professional-msvc2005/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)

  • trunk/mkspecs/wincewm60professional-msvc2008/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)

  • trunk/mkspecs/wincewm60standard-msvc2005/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)

  • trunk/mkspecs/wincewm60standard-msvc2008/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)

  • trunk/mkspecs/wincewm65professional-msvc2005/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)

  • trunk/mkspecs/wincewm65professional-msvc2008/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.