| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
| |
(cherry picked from commit 01b3f508d1f7e9951baf60f487feadfa98ba4751)
Reapplied after bad v4.7.4 merge
|
| |
|
|
|
|
| |
(cherry picked from commit 9ed61311bce15b8f1bb4b30ee9133f1a2355f41d)
Reapplied after bad v4.7.4 merge
|
| |
|
|
|
|
| |
(cherry picked from commit 1bd6f1bd280ee6e1ecd4de2291c8ccfb4d06b7a4)
Reapplied after bad v4.7.4 merge
|
| | |
|
| |
|
|
|
| |
Task-number: QTBUG-20216
Reviewed-by: Laszlo Agocs
|
| |\ |
|
| | |\
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalAlignment and anchors.mirror properties
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
effectiveHorizontalAlignment and anchors.mirror properties
* these properties are seldomly used
* they confuse developers that do not care about right-to-left user interfaces
* LayoutMirroring.enabled property can be used instead to determine if mirroring is enabled
* if needed, you can easily determine the effective layout directions and alignments
with a little bit of JavaScript:
function effectiveLayoutDirection() {
if (LayoutMirroring.enabled)
return (listView.layoutDirection == Qt.LeftToRight) ? Qt.RightToLeft : Qt.LeftToRight;
else
return listView.layoutDirection;
}
Task-number: QTBUG-11042
Reviewed-by: Martin Jones
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Example application for OpenGL shading language and QML. Added also a link from qml examples main documents labs section.
Reviewed-by: Kim Gronholm
|
| |/ /
| |
| |
| |
| |
| | |
Added a link from qml element index, removed some unnecessary doc markings, added missing example image and some other minor fixes.
Reviewed-by: Kim Gronholm
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updating file with CRLF line endings for the updated header
Fix a regression in QList::mid()
update gitignore
remove -fno-stack-protector
Fix make confclean
Update licenseheader text in source files
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| |\ \ \
| |/ /
|/| | |
|
| | |\ \ |
|
| | | | |
| | | |
| | | |
| | | | |
Also updated the Config class for reuse.
|
| |\ \ \ \
| | |/ /
| |/| /
| |_|/
|/| | |
|
| | |/ |
|
| | |
| |
| |
| | |
Task-number: QTBUG-18509
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Input method hints are not correct if using proxy widget
Fix for GL graphcics system orientation which
Update Symbian platform notes documentation
|
| | | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-17357
Reviewed-by: Jason Barron
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Allow enum values to be used as signal parameters
ListModel::clear() should not clear roles
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The fix does not work for enums declared outside of the class that
emits the signal, since in this case it is not possible to access
the metaobject of the class that declared the enum. However the
fix makes a special case for the Qt namespace to allow enums in this
namespace to be used.
Task-number: QTBUG-15983
Change-Id: I6f72255b07010311a20fe068bd97c7db7b294d9b
Reviewed-by: Aaron Kennedy
|
| |\ \ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Fixed the declarative headers and includes within qdoc.
Removed invalid public slots section.
Minor feature fix led to refactoring for i18n's sake.
Fixed string-int concatenation issue.
qdoc: Allowed multiple values for certain metadata tags.
qdoc: modified \include to take a 2nd arg, snippet id.
Doc: Minor fix to title.
Doc: Fixed markup.
Doc: Added a missing command.
Doc: Removed duplicate documentation.
Removed some links and prettified others.
Doc: Squashed commit of Roland Wolf's threading tutorial.
|
| | |\ \ \ |
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
doc/src/getting-started/tutorials.qdoc
|
| | | |\ \ \ \ |
|
| | | | | | | | |
|
| | | |\ \ \ \ \ |
|
| | | | | | | | | |
|
| |\ \ \ \ \ \ \ \
| |_|_|_|_|/ / /
|/| | | | | / /
| | |_|_|_|/ /
| |/| | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix failing autotest
XmlListModel should allow types other than application/xml
Document using Behaviors with States.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Change-Id: I74f163cef8caa16cccb158061ec30ffb4e471fd1
Task-number: QTBUG-16856
Reviewed-by: Bea Lam
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The demos require QtMobility libraries. Added notices in the
demo pages about the requirement.
Reviewed-by: Casper van Donderen
|
| | |/ / / / /
|/| | | | | |
|
| |\ \ \ \ \ \ |
|
| | | | | | | | |
|
| | | |_|_|/ /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Added a link to the eLearning materials and Creator manual.
Reviewed-by: David Boddie
|
| |/ / / / /
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-16609
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-8078
|
| | | | | | |
|
| |\ \ \ \ \
| |_|_|_|/
|/| | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | |\ \ \ \ |
|
| | | | | | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: David Boddie
|
| | | | | | | |
|
