Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
Qt
QtDeclarative
Commits
7e73dc01
Commit
7e73dc01
authored
11 years ago
by
Frederik Gladhorn
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Ie4ce4c3e64f093eec26754e06199d350a46ae2a2
parents
e171d1e8
e840b9e2
No related merge requests found
Changes
41
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
dist/changes-5.1.0
+3
-0
dist/changes-5.1.0
examples/quick/demos/calqlatr/calqlatr.pro
+19
-0
examples/quick/demos/calqlatr/calqlatr.pro
examples/quick/demos/calqlatr/calqlatr.qml
+8
-3
examples/quick/demos/calqlatr/calqlatr.qml
examples/quick/demos/calqlatr/content/Display.qml
+18
-2
examples/quick/demos/calqlatr/content/Display.qml
examples/quick/demos/calqlatr/content/NumberPad.qml
+1
-1
examples/quick/demos/calqlatr/content/NumberPad.qml
examples/quick/demos/calqlatr/content/calculator.js
+4
-4
examples/quick/demos/calqlatr/content/calculator.js
examples/quick/dialogs/colorandfiledialogs/ColorDialogs.qml
+2
-0
examples/quick/dialogs/colorandfiledialogs/ColorDialogs.qml
examples/quick/dialogs/colorandfiledialogs/FileDialogs.qml
+2
-0
examples/quick/dialogs/colorandfiledialogs/FileDialogs.qml
examples/quick/dialogs/colorandfiledialogs/colorandfiledialogs.pro
+17
-0
...quick/dialogs/colorandfiledialogs/colorandfiledialogs.pro
examples/quick/dialogs/colorandfiledialogs/colorandfiledialogs.qrc
+0
-0
...quick/dialogs/colorandfiledialogs/colorandfiledialogs.qrc
examples/quick/dialogs/colorandfiledialogs/dialogs.qml
+0
-0
examples/quick/dialogs/colorandfiledialogs/dialogs.qml
examples/quick/dialogs/colorandfiledialogs/doc/images/qml-colorandfiledialogs-example.jpg
+0
-0
...iledialogs/doc/images/qml-colorandfiledialogs-example.jpg
examples/quick/dialogs/colorandfiledialogs/doc/src/colorandfiledialogs.qdoc
+44
-0
...logs/colorandfiledialogs/doc/src/colorandfiledialogs.qdoc
examples/quick/dialogs/colorandfiledialogs/main.cpp
+1
-1
examples/quick/dialogs/colorandfiledialogs/main.cpp
examples/quick/dialogs/dialogs.pro
+3
-16
examples/quick/dialogs/dialogs.pro
examples/quick/window/Splash.qml
+8
-3
examples/quick/window/Splash.qml
examples/quick/window/main.cpp
+2
-0
examples/quick/window/main.cpp
examples/quick/window/window.qml
+4
-3
examples/quick/window/window.qml
src/imports/dialogs/dialogs.pro
+2
-0
src/imports/dialogs/dialogs.pro
src/imports/dialogs/doc/qtquickdialogs.qdocconf
+37
-0
src/imports/dialogs/doc/qtquickdialogs.qdocconf
with
175 additions
and
33 deletions
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets