diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-31 05:54:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-31 05:54:11 (GMT) |
| commit | cf28f6cacf59d434072656af05466541ba69e8ae (patch) | |
| tree | ee8cd94426004623da1abaea6861a5a214214688 /tools | |
| parent | b705fec8d093d06adbbd1baf461948b95a031759 (diff) | |
| parent | 6a40104d587211dc740232fed908e29f0b58e2d9 (diff) | |
| download | Qt-cf28f6cacf59d434072656af05466541ba69e8ae.zip Qt-cf28f6cacf59d434072656af05466541ba69e8ae.tar.gz Qt-cf28f6cacf59d434072656af05466541ba69e8ae.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Don't double call classBegin()
Notify QML internal notifiers of item geometry changes before QML signal handlers.
Revert "Add 'cached' property to Image."
Add 'cached' property to Image.
Ensure Flickable visibleArea is updated when view height changes
Improve calling QML functions from C++ docs.
Add missing license headers
Remove debug.
Snake: Don't use Behavior with states.
QML Viewer should be put under QtDemos instead of QtExamples folder in Symbian app menu
Fix application exiting in embedded qml examples
QDeclarativeDebug: Destroy incoming connections if already connected
Simplify type management code
QML JavaScript .import parser
Fix VisualDataModel model update handling when rootIndex is specified.
Improve test reliability when running in parallel with other tests.
Improve stability of test on loaded hw.
Improve stability of test on loaded hw.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qml/qml.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index d794005..3927dd6 100644 --- a/tools/qml/qml.pro +++ b/tools/qml/qml.pro @@ -34,7 +34,7 @@ maemo5 { } symbian { TARGET.UID3 = 0x20021317 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) TARGET.EPOCHEAPSIZE = 0x20000 0x4000000 TARGET.CAPABILITY = NetworkServices ReadUserData !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) { |