Ignore:
Timestamp:
Aug 2, 2010, 9:27:30 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/gui/styles/styles.pri

    r651 r769  
    165165
    166166contains( styles, s60 ):contains(QT_CONFIG, s60) {
    167         HEADERS += \
    168                 styles/qs60style.h \
    169                 styles/qs60style_p.h
    170         SOURCES += styles/qs60style.cpp
    171         symbian {
    172                 SOURCES += styles/qs60style_s60.cpp
    173                 LIBS += -laknicon -laknskins -laknskinsrv -lfontutils -legul -lbmpanim
    174         } else {
    175                 SOURCES += styles/qs60style_simulated.cpp
    176                 RESOURCES += styles/qstyle_s60_simulated.qrc
    177         }
     167    HEADERS += \
     168        styles/qs60style.h \
     169        styles/qs60style_p.h
     170    SOURCES += styles/qs60style.cpp
     171    symbian {
     172        SOURCES += styles/qs60style_s60.cpp
     173        LIBS += -lAknIcon -lAKNSKINS -lAKNSKINSRV -lFontUtils -legul -lbmpanim
     174    } else {
     175        SOURCES += styles/qs60style_simulated.cpp
     176        RESOURCES += styles/qstyle_s60_simulated.qrc
     177    }
    178178} else {
    179         DEFINES += QT_NO_STYLE_S60
     179    DEFINES += QT_NO_STYLE_S60
    180180}
Note: See TracChangeset for help on using the changeset viewer.