diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-18 20:46:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-18 20:46:08 (GMT) |
| commit | ff0b4101f73f3e0cba47c0a39d65740decbd4307 (patch) | |
| tree | 7935ecd5818010f1ae95a842b6401557f2dd5990 /doc/src/snippets/declarative/codingconventions | |
| parent | 07965159f2507cdaf62c2ef539a0578f17832863 (diff) | |
| parent | c7e539c80fe4df93479970f03838a97d53f66460 (diff) | |
| download | Qt-ff0b4101f73f3e0cba47c0a39d65740decbd4307.zip Qt-ff0b4101f73f3e0cba47c0a39d65740decbd4307.tar.gz Qt-ff0b4101f73f3e0cba47c0a39d65740decbd4307.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (84 commits)
Fixes color property of QComboBox stylesheet
Updated QtCore DEF file for WINSCW and ARMV5
qRound: do not do operation with double when qreal is float
Fix the warnings when QBasicTimer are member of the ObjectPrivate
Fix QScriptValueIterator::hasNext and QScriptValueIterator::hasPrevious
Fix double click event on Mac OS X.
fixed CI gate flagged spelling error: occured -> occurred
file rename
various fixes to deal with CI gate failures
Autotest for QVariant value types
Fix memory leak
Clarify Component.createObject(null) behavior.
Fix system proxy test: QNetworkProxyFactory::systemProxyForQuery() is static
Proper fix for QGraphicsItem crash.
Fix QSharedMemory and QSystemSemaphore autotests for Symbian
Fix QSystemSemaphore handle management issues in Symbian
Fix doc typo
Document centerIn and fill in the anchors docs
Document level of support for QGraphicsObject properties
Add an autotest for QVariant method params
...
Diffstat (limited to 'doc/src/snippets/declarative/codingconventions')
6 files changed, 17 insertions, 9 deletions
diff --git a/doc/src/snippets/declarative/codingconventions/dotproperties.qml b/doc/src/snippets/declarative/codingconventions/dotproperties.qml index 98cb09c..7243ec2 100644 --- a/doc/src/snippets/declarative/codingconventions/dotproperties.qml +++ b/doc/src/snippets/declarative/codingconventions/dotproperties.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/snippets/declarative/codingconventions/javascript-imports.qml b/doc/src/snippets/declarative/codingconventions/javascript-imports.qml index 931349f..ba22967 100644 --- a/doc/src/snippets/declarative/codingconventions/javascript-imports.qml +++ b/doc/src/snippets/declarative/codingconventions/javascript-imports.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/snippets/declarative/codingconventions/javascript.qml b/doc/src/snippets/declarative/codingconventions/javascript.qml index 6c94626..8ca289f 100644 --- a/doc/src/snippets/declarative/codingconventions/javascript.qml +++ b/doc/src/snippets/declarative/codingconventions/javascript.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/snippets/declarative/codingconventions/lists.qml b/doc/src/snippets/declarative/codingconventions/lists.qml index a7f3c8f..4b63b55 100644 --- a/doc/src/snippets/declarative/codingconventions/lists.qml +++ b/doc/src/snippets/declarative/codingconventions/lists.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/snippets/declarative/codingconventions/photo.qml b/doc/src/snippets/declarative/codingconventions/photo.qml index 2eba035..78c5068 100644 --- a/doc/src/snippets/declarative/codingconventions/photo.qml +++ b/doc/src/snippets/declarative/codingconventions/photo.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -49,12 +49,20 @@ Rectangle { signal clicked // signal declarations - function doSomething(x) { // javascript functions + function doSomething(x) // javascript functions + { return x + photoImage.width } - x: 20; y: 20; width: 200; height: 150 // object properties - color: "gray" // try to group related properties together + color: "gray" // object properties + x: 20; y: 20; height: 150 // try to group related properties together + width: { // large bindings + if(photoImage.width > 200){ + photoImage.width; + }else{ + 200; + } + } Rectangle { // child objects id: border diff --git a/doc/src/snippets/declarative/codingconventions/private.qml b/doc/src/snippets/declarative/codingconventions/private.qml index 1d3dda8..909f5fa 100644 --- a/doc/src/snippets/declarative/codingconventions/private.qml +++ b/doc/src/snippets/declarative/codingconventions/private.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** |