Changeset 561 for trunk/mkspecs/features/unix

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/features/unix/dylib.prf (modified) (1 diff)
• mkspecs/features/unix/opengl.prf (modified) (1 diff)
• mkspecs/features/unix/openvg.prf (copied) (copied from branches/vendor/nokia/qt/4.6.1/mkspecs/features/unix/openvg.prf )
• mkspecs/features/unix/separate_debug_info.prf (modified) (1 diff)
• mkspecs/features/unix/x11lib.prf (modified) (1 diff)
• mkspecs/features/unix/x11sm.prf (modified) (1 diff)

trunk/mkspecs/features/unix/dylib.prf

@@ -1 @@
-LIBS += $$QMAKE_LIBS_DYNLOAD
+

trunk/mkspecs/features/unix/opengl.prf

@@ -1 @@
-INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
-!isEmpty(QMAKE_LIBDIR_OPENGL):QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL
-target_qt:LIBS += $$QMAKE_LIBS_OPENGL_QT
-else:LIBS += $$QMAKE_LIBS_OPENGL
+contains(QT_CONFIG, opengles1) {
+    INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES1
+    !isEmpty(QMAKE_LIBDIR_OPENGL_ES1):QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL_ES1
+    target_qt:LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL_ES1
+    else:LIBS += $$QMAKE_LIBS_OPENGL_ES1
+} else:contains(QT_CONFIG, opengles1cl) {
+    INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES1CL
+    !isEmpty(QMAKE_LIBDIR_OPENGL_ES1CL):QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL_ES1CL
+    target_qt:LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL_ES1CL
+    else:LIBS += $$QMAKE_LIBS_OPENGL_ES1CL
+} else:contains(QT_CONFIG, opengles2) {
+    INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2
+    !isEmpty(QMAKE_LIBDIR_OPENGL_ES2):QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL_ES2
+    target_qt:LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL_ES2
+    else:LIBS += $$QMAKE_LIBS_OPENGL_ES2
+} else {
+    INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
+    !isEmpty(QMAKE_LIBDIR_OPENGL):QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL
+    target_qt:LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL_QT
+    else:LIBS += $$QMAKE_LIBS_OPENGL
+}
+

trunk/mkspecs/features/unix/separate_debug_info.prf

@@ -1 +1 @@
 
-!staticlib:!static:!contains(TEMPLATE, subdirs):!isEmpty(QMAKE_OBJCOPY) {
+!separate_debug_info_nocopy:!staticlib:!static:!contains(TEMPLATE, subdirs):!isEmpty(QMAKE_OBJCOPY) {
     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\" ) ;
     QMAKE_INSTALL_SEPARATE_DEBUG_INFO = test -z "$(DESTDIR)" || cd \"$(DESTDIR)\" ; $(INSTALL_FILE) `basename $(TARGET)`.debug $(INSTALL_ROOT)/\$\$target_path/

trunk/mkspecs/features/unix/x11lib.prf

@@ -1 +1 @@
 !isEmpty(QMAKE_LIBDIR_X11):QMAKE_LIBDIR += $$QMAKE_LIBDIR_X11
-LIBS += $$QMAKE_LIBS_X11
+LIBS_PRIVATE += $$QMAKE_LIBS_X11

trunk/mkspecs/features/unix/x11sm.prf

@@ -1 +1 @@
 !isEmpty(QMAKE_LIBDIR_X11):QMAKE_LIBDIR += $$QMAKE_LIBDIR_X11
-LIBS += $$QMAKE_LIBS_X11SM
+LIBS_PRIVATE += $$QMAKE_LIBS_X11SM