Changeset 846 for trunk/src/gui/styles/styles.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/gui/styles/styles.pri (modified) (3 diffs)

trunk/src/gui/styles/styles.pri

@@ -47 +47 @@
         HEADERS += \
                 styles/qmacstyle_mac.h \
-                styles/qmacstylepixmaps_mac_p.h
+                styles/qmacstylepixmaps_mac_p.h \
+                styles/qmacstyle_mac_p.h
         OBJECTIVE_SOURCES += styles/qmacstyle_mac.mm
 
@@ -171 +172 @@
     symbian {
         SOURCES += styles/qs60style_s60.cpp
-        LIBS += -lAknIcon -lAKNSKINS -lAKNSKINSRV -lFontUtils -legul -lbmpanim
+        LIBS += -legul -lbmpanim
+        contains(CONFIG, is_using_gnupoc) {
+            LIBS += -laknicon -laknskins -laknskinsrv -lfontutils
+        } else {
+            LIBS += -lAknIcon -lAKNSKINS -lAKNSKINSRV -lFontUtils
+        }
     } else {
         SOURCES += styles/qs60style_simulated.cpp
@@ -177 +183 @@
     }
 } else {
+    symbian {
+        HEADERS += styles/qs60style.h
+        SOURCES += styles/qs60style_stub.cpp
+    }
     DEFINES += QT_NO_STYLE_S60
 }