Changeset 846 for trunk/tools/qml

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)
• tools/qml (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml )
• tools/qml/Info_mac.plist (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/Info_mac.plist )
• tools/qml/browser (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/browser )
• tools/qml/browser/Browser.qml (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/browser/Browser.qml )
• tools/qml/browser/browser.qrc (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/browser/browser.qrc )
• tools/qml/browser/images (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/browser/images )
• tools/qml/browser/images/folder.png (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/browser/images/folder.png )
• tools/qml/browser/images/titlebar.png (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/browser/images/titlebar.png )
• tools/qml/browser/images/titlebar.sci (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/browser/images/titlebar.sci )
• tools/qml/browser/images/up.png (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/browser/images/up.png )
• tools/qml/deviceorientation.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/deviceorientation.cpp )
• tools/qml/deviceorientation.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/deviceorientation.h )
• tools/qml/deviceorientation_harmattan.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/deviceorientation_harmattan.cpp )
• tools/qml/deviceorientation_maemo5.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/deviceorientation_maemo5.cpp )
• tools/qml/deviceorientation_symbian.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/deviceorientation_symbian.cpp )
• tools/qml/loggerwidget.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/loggerwidget.cpp )
• tools/qml/loggerwidget.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/loggerwidget.h )
• tools/qml/main.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/main.cpp )
• tools/qml/proxysettings.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/proxysettings.cpp )
• tools/qml/proxysettings.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/proxysettings.h )
• tools/qml/proxysettings.ui (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/proxysettings.ui )
• tools/qml/proxysettings_maemo5.ui (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/proxysettings_maemo5.ui )
• tools/qml/qdeclarativetester.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/qdeclarativetester.cpp )
• tools/qml/qdeclarativetester.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/qdeclarativetester.h )
• tools/qml/qml.icns (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/qml.icns )
• tools/qml/qml.pri (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/qml.pri )
• tools/qml/qml.pro (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/qml.pro )
• tools/qml/qmlruntime.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/qmlruntime.cpp )
• tools/qml/qmlruntime.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/qmlruntime.h )
• tools/qml/recopts.ui (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/recopts.ui )
• tools/qml/recopts_maemo5.ui (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/recopts_maemo5.ui )
• tools/qml/startup (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/startup )
• tools/qml/startup/Logo.qml (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/startup/Logo.qml )
• tools/qml/startup/qt-back.png (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/startup/qt-back.png )
• tools/qml/startup/qt-blue.jpg (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/startup/qt-blue.jpg )
• tools/qml/startup/qt-front.png (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/startup/qt-front.png )
• tools/qml/startup/qt-sketch.jpg (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/startup/qt-sketch.jpg )
• tools/qml/startup/qt-text.png (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/startup/qt-text.png )
• tools/qml/startup/quick-blur.png (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/startup/quick-blur.png )
• tools/qml/startup/quick-regular.png (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/startup/quick-regular.png )
• tools/qml/startup/shadow.png (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/startup/shadow.png )
• tools/qml/startup/startup.qml (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/startup/startup.qml )
• tools/qml/startup/startup.qrc (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/startup/startup.qrc )
• tools/qml/startup/white-star.png (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/startup/white-star.png )
• tools/qml/texteditautoresizer_maemo5.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/tools/qml/texteditautoresizer_maemo5.h )