Changeset 561 for trunk/mkspecs/common

Timestamp:

Feb 11, 2010, 11:19:06 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• mkspecs/common/linux.conf (modified) (2 diffs)
• mkspecs/common/mac-g++.conf (modified) (3 diffs)
• mkspecs/common/mac-llvm.conf (modified) (1 diff)
• mkspecs/common/mac.conf (modified) (1 diff)
• mkspecs/common/symbian (copied) (copied from branches/vendor/nokia/qt/4.6.1/mkspecs/common/symbian )
• mkspecs/common/symbian/qplatformdefs.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/mkspecs/common/symbian/qplatformdefs.h )
• mkspecs/common/symbian/stl-off (copied) (copied from branches/vendor/nokia/qt/4.6.1/mkspecs/common/symbian/stl-off )
• mkspecs/common/symbian/stl-off/new (copied) (copied from branches/vendor/nokia/qt/4.6.1/mkspecs/common/symbian/stl-off/new )
• mkspecs/common/symbian/symbian.conf (copied) (copied from branches/vendor/nokia/qt/4.6.1/mkspecs/common/symbian/symbian.conf )
• mkspecs/common/wince (copied) (copied from branches/vendor/nokia/qt/4.6.1/mkspecs/common/wince )
• mkspecs/common/wince.conf (deleted)
• mkspecs/common/wince/qmake.conf (copied) (copied from branches/vendor/nokia/qt/4.6.1/mkspecs/common/wince/qmake.conf )
• mkspecs/common/wince/qplatformdefs.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/mkspecs/common/wince/qplatformdefs.h )

trunk/mkspecs/common/linux.conf

@@ -14 +14 @@
 QMAKE_INCDIR_OPENGL   = /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL   = /usr/X11R6/lib
+QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
+QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
+QMAKE_INCDIR_OPENGL_ES1CL = $$QMAKE_INCDIR_OPENGL
+QMAKE_LIBDIR_OPENGL_ES1CL = $$QMAKE_LIBDIR_OPENGL
+QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
+QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
+QMAKE_INCDIR_EGL      = 
+QMAKE_LIBDIR_EGL      =
+QMAKE_INCDIR_OPENVG   = 
+QMAKE_LIBDIR_OPENVG   =
 
 QMAKE_LIBS            =
@@ -20 +30 @@
 QMAKE_LIBS_X11SM      = -lSM -lICE
 QMAKE_LIBS_NIS        = -lnsl
+QMAKE_LIBS_EGL        = -lEGL
 QMAKE_LIBS_OPENGL     = -lGLU -lGL
 QMAKE_LIBS_OPENGL_QT  = -lGL
+QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM
+QMAKE_LIBS_OPENGL_ES1CL = -lGLES_CL
+QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
+QMAKE_LIBS_OPENVG     = -lOpenVG
 QMAKE_LIBS_THREAD     = -lpthread
 

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

@@ -10 +10 @@
 QMAKE_CFLAGS_WARN_ON    += -Wall -W
 QMAKE_CFLAGS_WARN_OFF   += -w
-QMAKE_CFLAGS_RELEASE    += -Os
+QMAKE_CFLAGS_RELEASE    += -O2
 QMAKE_CFLAGS_DEBUG      += -g
 QMAKE_CFLAGS_SHLIB      += -fPIC
@@ -47 +47 @@
 QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
 
-QMAKE_LINK               = g++
-QMAKE_LINK_SHLIB         = g++
-QMAKE_LINK_C             = gcc
-QMAKE_LINK_C_SHLIB       = gcc
+QMAKE_LINK               = $$QMAKE_CXX
+QMAKE_LINK_SHLIB         = $$QMAKE_CXX
+QMAKE_LINK_C             = $$QMAKE_CC
+QMAKE_LINK_C_SHLIB       = $$QMAKE_CC
 QMAKE_LFLAGS            += -headerpad_max_install_names
 QMAKE_LFLAGS_RELEASE    +=
@@ -66 +66 @@
 QMAKE_LFLAGS_VERSION    += -current_version$${LITERAL_WHITESPACE}
 QMAKE_LFLAGS_COMPAT_VERSION += -compatibility_version$${LITERAL_WHITESPACE}
+# -all_load requred to make Objective-C categories work in static builds.
+QMAKE_LFLAGS_STATIC_LIB += -all_load
 QMAKE_RPATH             +=
 

trunk/mkspecs/common/mac-llvm.conf

@@ -49 +49 @@
 QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
 
-QMAKE_LINK               = llvm-g++
-QMAKE_LINK_SHLIB         = llvm-g++
+QMAKE_LINK               = $$QMAKE_CXX
+QMAKE_LINK_SHLIB         = $$QMAKE_CXX
 QMAKE_LFLAGS            += -headerpad_max_install_names
 QMAKE_LFLAGS_RELEASE    +=

trunk/mkspecs/common/mac.conf

@@ -39 +39 @@
 QMAKE_CHK_DIR_EXISTS    = test -d
 QMAKE_MKDIR             = mkdir -p
-# Need to enable the correct deployment target for Cocoa (should be 10.3 for Carbon).
-macx-icc: QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
-else: QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3
+QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 # overridden to 10.5 for Cocoa on the compiler command line
+
 
 include(unix.conf)