diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-09-07 03:07:16 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-09-07 03:07:16 (GMT) |
| commit | 6ead3fa2b5b88844fb85137a7e11708084e63cbf (patch) | |
| tree | 9e556bea011064b8f001fb4c1468b3cdf7d803e3 | |
| parent | bb6fb2bb9e329024f617369dc3ae9dde2963287b (diff) | |
| parent | 16cdd82a88a63ea050ab2cf70368e023fe50c5bd (diff) | |
| download | Qt-6ead3fa2b5b88844fb85137a7e11708084e63cbf.zip Qt-6ead3fa2b5b88844fb85137a7e11708084e63cbf.tar.gz Qt-6ead3fa2b5b88844fb85137a7e11708084e63cbf.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| -rw-r--r-- | demos/declarative/flickr/common/ScrollBar.qml | 4 | ||||
| -rw-r--r-- | src/corelib/kernel/kernel.pri | 2 | ||||
| -rw-r--r-- | src/declarative/qml/qmetaobjectbuilder.cpp (renamed from src/corelib/kernel/qmetaobjectbuilder.cpp) | 0 | ||||
| -rw-r--r-- | src/declarative/qml/qmetaobjectbuilder_p.h (renamed from src/corelib/kernel/qmetaobjectbuilder_p.h) | 0 | ||||
| -rw-r--r-- | src/declarative/qml/qml.pri | 6 |
5 files changed, 6 insertions, 6 deletions
diff --git a/demos/declarative/flickr/common/ScrollBar.qml b/demos/declarative/flickr/common/ScrollBar.qml index 89d51e2..d31c57c 100644 --- a/demos/declarative/flickr/common/ScrollBar.qml +++ b/demos/declarative/flickr/common/ScrollBar.qml @@ -12,9 +12,9 @@ Item { border.color: "white" border.width: 2 x: 0 - y: flickableArea.pageYPosition * Container.height + y: flickableArea.visibleArea.yPosition * Container.height width: parent.width - height: flickableArea.pageHeight * Container.height + height: flickableArea.visibleArea.heightRatio * Container.height } states: [ State { diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri index ddb4017..003693b 100644 --- a/src/corelib/kernel/kernel.pri +++ b/src/corelib/kernel/kernel.pri @@ -33,7 +33,6 @@ HEADERS += \ kernel/qsystemsemaphore.h \ kernel/qsystemsemaphore_p.h \ kernel/qfunctions_p.h \ - kernel/qmetaobjectbuilder_p.h \ kernel/qguard_p.h SOURCES += \ @@ -56,7 +55,6 @@ SOURCES += \ kernel/qcoreglobaldata.cpp \ kernel/qsharedmemory.cpp \ kernel/qsystemsemaphore.cpp \ - kernel/qmetaobjectbuilder.cpp \ kernel/qpointer.cpp win32 { diff --git a/src/corelib/kernel/qmetaobjectbuilder.cpp b/src/declarative/qml/qmetaobjectbuilder.cpp index 58ee454..58ee454 100644 --- a/src/corelib/kernel/qmetaobjectbuilder.cpp +++ b/src/declarative/qml/qmetaobjectbuilder.cpp diff --git a/src/corelib/kernel/qmetaobjectbuilder_p.h b/src/declarative/qml/qmetaobjectbuilder_p.h index d503163..d503163 100644 --- a/src/corelib/kernel/qmetaobjectbuilder_p.h +++ b/src/declarative/qml/qmetaobjectbuilder_p.h diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri index 9a8d3f2..29d97ba 100644 --- a/src/declarative/qml/qml.pri +++ b/src/declarative/qml/qml.pri @@ -31,7 +31,8 @@ SOURCES += qml/qmlparser.cpp \ qml/qmlbasicscript.cpp \ qml/qmlvaluetype.cpp \ qml/qmlbindingoptimizations.cpp \ - qml/qmlxmlhttprequest.cpp + qml/qmlxmlhttprequest.cpp \ + qml/qmetaobjectbuilder.cpp HEADERS += qml/qmlparser_p.h \ qml/qmlinstruction_p.h \ @@ -79,7 +80,8 @@ HEADERS += qml/qmlparser_p.h \ qml/qpodvector_p.h \ qml/qmlvaluetype_p.h \ qml/qmlbindingoptimizations_p.h \ - qml/qmlxmlhttprequest_p.h + qml/qmlxmlhttprequest_p.h \ + qml/qmetaobjectbuilder_p.h # for qtscript debugger contains(QT_CONFIG, scripttools):QT += scripttools |