Changeset 846 for trunk/src/tools/bootstrap/bootstrap.pri

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:

• . (modified) (1 prop)
• src/tools/bootstrap/bootstrap.pri (modified) (2 diffs)

trunk/src/tools/bootstrap/bootstrap.pri

@@ -43 +43 @@
     contains(CONFIG, debug_and_release_target) {
         CONFIG(debug, debug|release) {
-            LIBS+=-L$$QT_BUILD_TREE/src/tools/bootstrap/debug
+            $$QT_BUILD_TREE/src/tools/bootstrap/debug
         } else {
-            LIBS+=-L$$QT_BUILD_TREE/src/tools/bootstrap/release
+            $$QT_BUILD_TREE/src/tools/bootstrap/release
         }
     } else {
-        LIBS += -L$$QT_BUILD_TREE/src/tools/bootstrap
+        $$QT_BUILD_TREE/src/tools/bootstrap
     }
     LIBS += -lbootstrap
 }
-!contains(QT_CONFIG, zlib):!contains(QT_CONFIG, no-zlib) {
-   unix:LIBS += -lz
-#  win32:LIBS += libz.lib
+!contains(QT_CONFIG, zlib):!contains(QT_CONFIG, no-zlib):!cross_compile {
+    symbian:LIBS_PRIVATE += -llibz
+    else:if(unix|win32-g++*):LIBS_PRIVATE += -lz
+    else:LIBS += zdll.lib
 }
 win32:LIBS += -luser32
@@ -63 +64 @@
 }
 
+
+
+
+
+
+
+
+
+