diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-18 11:22:31 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-18 11:22:31 (GMT) |
| commit | 465f4df8ad4be9485c37ecc379c45e758b2842ad (patch) | |
| tree | 5067e1a64edb496c76e699d2e2b295a9d7aad784 /examples | |
| parent | 0cea0e45523283d6c31998672f97b0343c1388f2 (diff) | |
| parent | e66fcc2b1897883d8ec0780c731c5989cb657cdf (diff) | |
| download | Qt-465f4df8ad4be9485c37ecc379c45e758b2842ad.zip Qt-465f4df8ad4be9485c37ecc379c45e758b2842ad.tar.gz Qt-465f4df8ad4be9485c37ecc379c45e758b2842ad.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: (29 commits)
Recognize identifiers containing unicode escape sequences.
Fix README
Fix doc: QML_DECLARE_TYPE is no longer necessary
Fix doc: remote contents requires qmldir
Fixed parsing of inner labelled statements.
Doc
Remove unsupported plugin version flags in .pro files of declarative examples
Documentation typo.
More QML doc consistency.
Ensure existing image is gone before next photo selection.
Don't use zoomfactor.
Doc: in QML use "real" and "enumeration", not "qreal" and "enum"
Doc: Put "default" property label on same line as property name
Wait for debug clients asynchronously instead of blocking creation of
Test not reliable
ResizeMode support for QGraphicsWidgets created with QDeclarativeView
More class documentation fixes for declarative.
Simplify QML import plugin deployment lines
Add QML imports to s60installs.pro
Cleanup photoviewer demo.
...
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/declarative/plugins/README | 2 | ||||
| -rw-r--r-- | examples/declarative/plugins/plugins.pro | 1 | ||||
| -rw-r--r-- | examples/declarative/proxywidgets/proxywidgets.pro | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/examples/declarative/plugins/README b/examples/declarative/plugins/README index 3ae256d..fe519f8 100644 --- a/examples/declarative/plugins/README +++ b/examples/declarative/plugins/README @@ -5,5 +5,5 @@ by a C++ plugin (providing the "Time" type), and by QML files (providing the To run: make install - qml plugins.qml + qml -I . plugins.qml diff --git a/examples/declarative/plugins/plugins.pro b/examples/declarative/plugins/plugins.pro index c409d39..b501ae3 100644 --- a/examples/declarative/plugins/plugins.pro +++ b/examples/declarative/plugins/plugins.pro @@ -3,7 +3,6 @@ DESTDIR = com/nokia/TimeExample TARGET = qtimeexampleqmlplugin CONFIG += qt plugin QT += declarative -VERSION = 1.0.0 SOURCES += plugin.cpp diff --git a/examples/declarative/proxywidgets/proxywidgets.pro b/examples/declarative/proxywidgets/proxywidgets.pro index eb85191..cb07d80 100644 --- a/examples/declarative/proxywidgets/proxywidgets.pro +++ b/examples/declarative/proxywidgets/proxywidgets.pro @@ -3,7 +3,6 @@ DESTDIR = ProxyWidgets TARGET = proxywidgetsplugin CONFIG += qt plugin QT += declarative -VERSION = 1.0.0 SOURCES += proxywidgets.cpp |