Changeset 846 for trunk/mkspecs/unsupported
- Timestamp:
- May 5, 2011, 5:36:53 AM (15 years ago)
- Location:
- trunk
- Files:
-
- 21 edited
- 6 copied
-
. (modified) (1 prop)
-
mkspecs/unsupported/linux-host-g++/qmake.conf (modified) (3 diffs)
-
mkspecs/unsupported/linux-host-g++/qplatformdefs.h (modified) (1 diff)
-
mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf (modified) (1 diff)
-
mkspecs/unsupported/linux-scratchbox2-g++/qplatformdefs.h (modified) (1 diff)
-
mkspecs/unsupported/qnx-g++/qmake.conf (modified) (1 diff)
-
mkspecs/unsupported/qnx-g++/qplatformdefs.h (modified) (2 diffs)
-
mkspecs/unsupported/qws/qnx-641 (copied) (copied from branches/vendor/nokia/qt/4.7.2/mkspecs/unsupported/qws/qnx-641 )
-
mkspecs/unsupported/qws/qnx-641/qmake.conf (copied) (copied from branches/vendor/nokia/qt/4.7.2/mkspecs/unsupported/qws/qnx-641/qmake.conf )
-
mkspecs/unsupported/qws/qnx-641/qplatformdefs.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/mkspecs/unsupported/qws/qnx-641/qplatformdefs.h )
-
mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf (modified) (2 diffs)
-
mkspecs/unsupported/qws/qnx-generic-g++/qplatformdefs.h (modified) (1 diff)
-
mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf (modified) (2 diffs)
-
mkspecs/unsupported/qws/qnx-i386-g++/qplatformdefs.h (modified) (1 diff)
-
mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf (modified) (2 diffs)
-
mkspecs/unsupported/qws/qnx-ppc-g++/qplatformdefs.h (modified) (1 diff)
-
mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf (modified) (2 diffs)
-
mkspecs/unsupported/vxworks-ppc-dcc/qplatformdefs.h (modified) (1 diff)
-
mkspecs/unsupported/vxworks-ppc-g++/qmake.conf (modified) (1 diff)
-
mkspecs/unsupported/vxworks-ppc-g++/qplatformdefs.h (modified) (1 diff)
-
mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf (modified) (2 diffs)
-
mkspecs/unsupported/vxworks-simpentium-dcc/qplatformdefs.h (modified) (1 diff)
-
mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf (modified) (1 diff)
-
mkspecs/unsupported/vxworks-simpentium-g++/qplatformdefs.h (modified) (2 diffs)
-
mkspecs/unsupported/win32-g++-cross (copied) (copied from branches/vendor/nokia/qt/4.7.2/mkspecs/unsupported/win32-g++-cross )
-
mkspecs/unsupported/win32-g++-cross/qmake.conf (copied) (copied from branches/vendor/nokia/qt/4.7.2/mkspecs/unsupported/win32-g++-cross/qmake.conf )
-
mkspecs/unsupported/win32-g++-cross/qplatformdefs.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/mkspecs/unsupported/win32-g++-cross/qplatformdefs.h )
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.7.2 (added) merged: 845 /branches/vendor/nokia/qt/current merged: 844 /branches/vendor/nokia/qt/4.6.3 removed
- Property svn:mergeinfo changed
-
trunk/mkspecs/unsupported/linux-host-g++/qmake.conf
r561 r846 64 64 QMAKE_LFLAGS_THREAD += 65 65 QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined 66 QMAKE_ RPATH= -Wl,-rpath,66 QMAKE_LFLAGS_RPATH = -Wl,-rpath, 67 67 68 68 QMAKE_PCH_OUTPUT_EXT = .gch … … 89 89 QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL 90 90 QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL 91 QMAKE_INCDIR_OPENGL_ES1CL = $$QMAKE_INCDIR_OPENGL92 QMAKE_LIBDIR_OPENGL_ES1CL = $$QMAKE_LIBDIR_OPENGL93 91 QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL 94 92 QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL … … 107 105 QMAKE_LIBS_OPENGL_QT = -lGL 108 106 QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM 109 QMAKE_LIBS_OPENGL_ES1CL = -lGLES_CL110 107 QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 111 108 QMAKE_LIBS_OPENVG = -lOpenVG -
trunk/mkspecs/unsupported/linux-host-g++/qplatformdefs.h
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf
r561 r846 13 13 14 14 MAKEFILE_GENERATOR = UNIX 15 TARGET_PLATFORM = unix 15 16 TEMPLATE = app 16 17 CONFIG += qt warn_on release incremental link_prl -
trunk/mkspecs/unsupported/linux-scratchbox2-g++/qplatformdefs.h
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/mkspecs/unsupported/qnx-g++/qmake.conf
r561 r846 6 6 7 7 MAKEFILE_GENERATOR = UNIX 8 TARGET_PLATFORM = unix 8 9 TEMPLATE = app 9 10 CONFIG += qt warn_on release link_prl -
trunk/mkspecs/unsupported/qnx-g++/qplatformdefs.h
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) … … 82 82 #include <arpa/inet.h> 83 83 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" 154 86 155 87 #define QT_SNPRINTF ::snprintf -
trunk/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf
r561 r846 6 6 7 7 MAKEFILE_GENERATOR = UNIX 8 TARGET_PLATFORM = unix 8 9 TEMPLATE = app 9 10 CONFIG += qt warn_on release link_prl … … 53 54 QMAKE_LFLAGS_SONAME += -Wl,-soname, 54 55 QMAKE_LFLAGS_THREAD += 55 QMAKE_ RPATH= -Wl,-rpath,56 QMAKE_LFLAGS_RPATH = -Wl,-rpath, 56 57 57 58 QMAKE_PCH_OUTPUT_EXT = .gch -
trunk/mkspecs/unsupported/qws/qnx-generic-g++/qplatformdefs.h
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf
r561 r846 6 6 7 7 MAKEFILE_GENERATOR = UNIX 8 TARGET_PLATFORM = unix 8 9 TEMPLATE = app 9 10 CONFIG += qt warn_on release link_prl … … 49 50 QMAKE_LFLAGS_SONAME += -Wl,-soname, 50 51 QMAKE_LFLAGS_THREAD += 51 QMAKE_ RPATH= -Wl,-rpath,52 QMAKE_LFLAGS_RPATH = -Wl,-rpath, 52 53 53 54 QMAKE_PCH_OUTPUT_EXT = .gch -
trunk/mkspecs/unsupported/qws/qnx-i386-g++/qplatformdefs.h
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf
r561 r846 6 6 7 7 MAKEFILE_GENERATOR = UNIX 8 TARGET_PLATFORM = unix 8 9 TEMPLATE = app 9 10 CONFIG += qt warn_on release link_prl … … 49 50 QMAKE_LFLAGS_SONAME += -Wl,-soname, 50 51 QMAKE_LFLAGS_THREAD += 51 QMAKE_ RPATH= -Wl,-rpath,52 QMAKE_LFLAGS_RPATH = -Wl,-rpath, 52 53 53 54 QMAKE_PCH_OUTPUT_EXT = .gch -
trunk/mkspecs/unsupported/qws/qnx-ppc-g++/qplatformdefs.h
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
r561 r846 4 4 5 5 MAKEFILE_GENERATOR = UNIX 6 TARGET_PLATFORM = unix 6 7 TEMPLATE = app 7 8 CONFIG += qt warn_on release incremental link_prl vxworks … … 53 54 QMAKE_LFLAGS_THREAD += 54 55 QMAKE_LFLAGS_NOUNDEF += 55 QMAKE_ RPATH=56 QMAKE_LFLAGS_RPATH = 56 57 57 58 QMAKE_PCH_OUTPUT_EXT = .gch -
trunk/mkspecs/unsupported/vxworks-ppc-dcc/qplatformdefs.h
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf
r561 r846 4 4 5 5 MAKEFILE_GENERATOR = UNIX 6 TARGET_PLATFORM = unix 6 7 TEMPLATE = app 7 8 CONFIG += qt warn_on release incremental link_prl vxworks -
trunk/mkspecs/unsupported/vxworks-ppc-g++/qplatformdefs.h
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
r561 r846 4 4 5 5 MAKEFILE_GENERATOR = UNIX 6 TARGET_PLATFORM = unix 6 7 TEMPLATE = app 7 8 CONFIG += qt warn_on release incremental link_prl vxworks … … 53 54 QMAKE_LFLAGS_THREAD += 54 55 QMAKE_LFLAGS_NOUNDEF += 55 QMAKE_ RPATH=56 QMAKE_LFLAGS_RPATH = 56 57 57 58 QMAKE_PCH_OUTPUT_EXT = .gch -
trunk/mkspecs/unsupported/vxworks-simpentium-dcc/qplatformdefs.h
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf
r561 r846 4 4 5 5 MAKEFILE_GENERATOR = UNIX 6 TARGET_PLATFORM = unix 6 7 TEMPLATE = app 7 8 CONFIG += qt warn_on release incremental link_prl vxworks -
trunk/mkspecs/unsupported/vxworks-simpentium-g++/qplatformdefs.h
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) … … 48 48 #include "qfunctions_vxworks.h" 49 49 50 #define QT_USE_XOPEN_LFS_EXTENSIONS 51 #include "../../common/posix/qplatformdefs.h" 50 52 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 72 59 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) 92 62 93 #define QT_STAT_REG S_IFREG94 #define QT_STAT_DIR S_IFDIR95 #define QT_STAT_MASK S_IFMT96 #define QT_STAT_LNK S_IFLNK97 #define QT_SOCKET_CONNECT(sd, to, tolen) \98 ::connect(sd, (struct sockaddr *) to, tolen)99 #define QT_SOCKET_BIND ::bind100 #define QT_FILENO fileno101 #define QT_CLOSE ::close102 63 #define QT_READ(fd, buf, len) ::read(fd, (char*) buf, len) 103 64 #define QT_WRITE(fd, buf, len) ::write(fd, (char*) buf, len) 104 #define QT_ACCESS ::access105 #define QT_GETCWD ::getcwd106 #define QT_CHDIR ::chdir107 #define QT_MKDIR(dir, perm) ::mkdir(dir)108 #define QT_RMDIR ::rmdir109 #define QT_OPEN_LARGEFILE O_LARGEFILE110 #define QT_OPEN_RDONLY O_RDONLY111 #define QT_OPEN_WRONLY O_WRONLY112 #define QT_OPEN_RDWR O_RDWR113 #define QT_OPEN_CREAT O_CREAT114 #define QT_OPEN_TRUNC O_TRUNC115 #define QT_OPEN_APPEND O_APPEND116 117 #define QT_SIGNAL_RETTYPE void118 #define QT_SIGNAL_ARGS int119 #define QT_SIGNAL_IGNORE SIG_IGN120 65 121 66 // there IS a socklen_t in sys/socket.h (unsigned int), 122 67 // but sockLib.h uses int in all function declaration... 123 //#define QT_SOCKLEN_T socklen_t124 68 #define QT_SOCKLEN_T int 69 #define QT_SOCKET_CONNECT(sd, to, tolen) \ 70 ::connect(sd, (struct sockaddr *) to, tolen) 125 71 126 72 #define QT_SNPRINTF ::snprintf 127 73 #define QT_VSNPRINTF ::vsnprintf 128 74 129 130 75 #endif // QPLATFORMDEFS_H
Note:
See TracChangeset
for help on using the changeset viewer.
