Changeset 561 for trunk/src/gui/styles/styles.pri

Timestamp:

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

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/styles/styles.pri (modified) (5 diffs)

trunk/src/gui/styles/styles.pri

@@ -8 +8 @@
         styles/qcommonstylepixmaps_p.h \
         styles/qcommonstyle.h \
+        styles/qstylehelper_p.h \
+        styles/qproxystyle.h \
+        styles/qproxystyle_p.h \
         styles/qstylesheetstyle_p.h
+
 SOURCES += \
         styles/qstyle.cpp \
@@ -14 +18 @@
         styles/qstyleoption.cpp \
         styles/qstyleplugin.cpp \
+        styles/qstylehelper.cpp \
         styles/qcommonstyle.cpp \
+        styles/qproxystyle.cpp \
         styles/qstylesheetstyle.cpp \
         styles/qstylesheetstyle_default.cpp
@@ -32 +38 @@
 x11{
     QMAKE_CXXFLAGS += $$QT_CFLAGS_QGTKSTYLE
-    LIBS += $$QT_LIBS_QGTKSTYLE
+    LIBS_PRIVATE += $$QT_LIBS_QGTKSTYLE
     styles += gtk
 }
@@ -104 +110 @@
         HEADERS += styles/qgtkstyle.h
         HEADERS += styles/qgtkpainter_p.h
-        HEADERS += styles/gtksymbols_p.h
+        HEADERS += styles/qgtkstyle_p.h
         SOURCES += styles/qgtkstyle.cpp
         SOURCES += styles/qgtkpainter.cpp
-        SOURCES += styles/gtksymbols.cpp
+        SOURCES += styles/qgtkstyle_p.cpp
         !contains( styles, cleanlooks ) {
                 styles += cleanlooks
@@ -156 +162 @@
 }
 
+contains( styles, s60 ):contains(QT_CONFIG, s60) {
+        HEADERS += \
+                styles/qs60style.h \
+                styles/qs60style_p.h
+        SOURCES += styles/qs60style.cpp
+        symbian {
+                SOURCES += styles/qs60style_s60.cpp
+                LIBS += -laknicon -laknskins -laknskinsrv -lfontutils -legul
+        } else {
+                SOURCES += styles/qs60style_simulated.cpp
+                RESOURCES += styles/qstyle_s60_simulated.qrc
+        }
+} else {
+        DEFINES += QT_NO_STYLE_S60
+}