Ignore:
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:
7 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/tools/shared/deviceskin/deviceskin.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/shared/deviceskin/deviceskin.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/shared/deviceskin/deviceskin.pri

    r561 r846  
    33SOURCES += $$PWD/deviceskin.cpp
    44RESOURCES += $$PWD/skins/ClamshellPhone.qrc \
    5     $$PWD/skins/PDAPhone.qrc \
    65    $$PWD/skins/SmartPhone2.qrc \
    76    $$PWD/skins/SmartPhone.qrc \
    87    $$PWD/skins/SmartPhoneWithButtons.qrc \
    98    $$PWD/skins/TouchscreenPhone.qrc \
    10     $$PWD/skins/Trolltech-Keypad.qrc \
    11     $$PWD/skins/Trolltech-Touchscreen.qrc \
    129    $$PWD/skins/PortableMedia.qrc \
    1310    $$PWD/skins/S60-QVGA-Candybar.qrc \
Note: See TracChangeset for help on using the changeset viewer.