| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
| |
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
| |
|
|
|
|
|
|
|
| |
Modified the project to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according to
the changes.
Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Conflicts:
examples/declarative/animation/basics/color-animation/qml/basics.qmlproject
examples/declarative/animation/basics/property-animation/qml/basics.qmlproject
examples/declarative/animation/basics/property-animation/qml/images/face-smile.png
examples/declarative/animation/basics/property-animation/qml/images/moon.png
examples/declarative/animation/basics/property-animation/qml/images/shadow.png
examples/declarative/animation/basics/property-animation/qml/images/star.png
examples/declarative/animation/basics/property-animation/qml/images/sun.png
examples/declarative/animation/behaviors/behavior-example/qml/behaviors.qmlproject
examples/declarative/animation/easing/qml/easing.qmlproject
examples/declarative/animation/states/qml/qt-logo.png
examples/declarative/animation/states/qml/states.qmlproject
examples/declarative/demos/calculator/qml/calculator.qmlproject
examples/declarative/demos/samegame/qml/samegame.qmlproject
examples/declarative/demos/webbrowser/qml/webbrowser.qmlproject
examples/declarative/i18n/qml/i18n.qmlproject
examples/declarative/i18n/qml/i18n/base.ts
examples/declarative/i18n/qml/i18n/qml_en_AU.qm
examples/declarative/i18n/qml/i18n/qml_en_AU.ts
examples/declarative/i18n/qml/i18n/qml_fr.qm
examples/declarative/i18n/qml/i18n/qml_fr.ts
examples/declarative/imageelements/image/qml/image.qmlproject
examples/declarative/imageelements/image/qml/qt-logo.png
examples/declarative/imageelements/shadows/qml/borderimage.qmlproject
examples/declarative/imageelements/shadows/qml/content/bw.png
examples/declarative/imageelements/shadows/qml/content/colors-round.sci
examples/declarative/imageelements/shadows/qml/content/colors-stretch.sci
examples/declarative/imageelements/shadows/qml/content/colors.png
examples/declarative/imageelements/shadows/qml/content/shadow.png
examples/declarative/keyinteraction/focus/qml/Core/images/arrow.png
examples/declarative/keyinteraction/focus/qml/Core/images/qt-logo.png
examples/declarative/keyinteraction/focus/qml/focus.qmlproject
examples/declarative/modelviews/Delegate/qml/package.qmlproject
examples/declarative/modelviews/gridview-example/qml/gridview.qmlproject
examples/declarative/modelviews/gridview-example/qml/pics/AddressBook_48.png
examples/declarative/modelviews/gridview-example/qml/pics/AudioPlayer_48.png
examples/declarative/modelviews/gridview-example/qml/pics/Camera_48.png
examples/declarative/modelviews/gridview-example/qml/pics/DateBook_48.png
examples/declarative/modelviews/gridview-example/qml/pics/EMail_48.png
examples/declarative/modelviews/gridview-example/qml/pics/TodoList_48.png
examples/declarative/modelviews/gridview-example/qml/pics/VideoPlayer_48.png
examples/declarative/modelviews/listview/sections/qml/content/pics/fruit-salad.jpg
examples/declarative/modelviews/listview/sections/qml/content/pics/hamburger.jpg
examples/declarative/modelviews/listview/sections/qml/content/pics/lemonade.jpg
examples/declarative/modelviews/listview/sections/qml/content/pics/moreDown.png
examples/declarative/modelviews/listview/sections/qml/content/pics/moreUp.png
examples/declarative/modelviews/listview/sections/qml/content/pics/pancakes.jpg
examples/declarative/modelviews/listview/sections/qml/content/pics/vegetable-soup.jpg
examples/declarative/modelviews/listview/sections/qml/listview.qmlproject
examples/declarative/modelviews/pathview-example/qml/pathview.qmlproject
examples/declarative/modelviews/pathview-example/qml/pics/AddressBook_48.png
examples/declarative/modelviews/pathview-example/qml/pics/AudioPlayer_48.png
examples/declarative/modelviews/pathview-example/qml/pics/Camera_48.png
examples/declarative/modelviews/pathview-example/qml/pics/DateBook_48.png
examples/declarative/modelviews/pathview-example/qml/pics/EMail_48.png
examples/declarative/modelviews/pathview-example/qml/pics/TodoList_48.png
examples/declarative/modelviews/pathview-example/qml/pics/VideoPlayer_48.png
examples/declarative/modelviews/visualitemmodel/qml/visualitemmodel.qmlproject
examples/declarative/modelviews/webview/autosize/qml/webview.qmlproject
examples/declarative/modelviews/webview/newwindows/qml/alerts.html
examples/declarative/modelviews/webview/newwindows/qml/content/Mapping/map.html
examples/declarative/modelviews/webview/newwindows/qml/content/pics/cancel.png
examples/declarative/modelviews/webview/newwindows/qml/content/pics/ok.png
examples/declarative/modelviews/webview/newwindows/qml/newwindows.html
examples/declarative/modelviews/webview/newwindows/qml/webview.qmlproject
examples/declarative/positioners/qml/add.png
examples/declarative/positioners/qml/del.png
examples/declarative/positioners/qml/positioners.qmlproject
examples/declarative/text/fonts/banner/qml/fonts.qmlproject
examples/declarative/text/fonts/hello/qml/fonts.qmlproject
examples/declarative/text/fonts/hello/qml/fonts/tarzeau_ocr_a.ttf
examples/declarative/text/textselection/qml/pics/endHandle.png
examples/declarative/text/textselection/qml/pics/endHandle.sci
examples/declarative/text/textselection/qml/pics/startHandle.png
examples/declarative/text/textselection/qml/pics/startHandle.sci
examples/declarative/text/textselection/qml/textselection.qmlproject
examples/declarative/touchinteraction/gestures/experimental-gestures/qml/gestures.qmlproject
examples/declarative/touchinteraction/mousearea/mousearea-example/qml/mousearea.qmlproject
examples/declarative/toys/clocks/qml/clocks.qmlproject
examples/declarative/toys/clocks/qml/content/quit.png
examples/declarative/toys/corkboards/qml/cork.jpg
examples/declarative/toys/corkboards/qml/corkboards.qmlproject
examples/declarative/toys/corkboards/qml/note-yellow.png
examples/declarative/toys/corkboards/qml/tack.png
examples/declarative/toys/dynamicscene/qml/dynamicscene.qmlproject
examples/declarative/toys/dynamicscene/qml/images/NOTE
examples/declarative/toys/dynamicscene/qml/images/face-smile.png
examples/declarative/toys/dynamicscene/qml/images/moon.png
examples/declarative/toys/dynamicscene/qml/images/rabbit_brown.png
examples/declarative/toys/dynamicscene/qml/images/rabbit_bw.png
examples/declarative/toys/dynamicscene/qml/images/star.png
examples/declarative/toys/dynamicscene/qml/images/sun.png
examples/declarative/toys/dynamicscene/qml/images/tree_s.png
examples/declarative/toys/dynamicscene/qml/qml/itemCreation.js
examples/declarative/toys/tic-tac-toe/qml/content/pics/board.png
examples/declarative/toys/tic-tac-toe/qml/content/pics/o.png
examples/declarative/toys/tic-tac-toe/qml/content/pics/x.png
examples/declarative/toys/tic-tac-toe/qml/content/tic-tac-toe.js
examples/declarative/toys/tic-tac-toe/qml/tic-tac-toe.qmlproject
examples/declarative/toys/tvtennis/qml/tvtennis.qmlproject
examples/declarative/ui-components/dialcontrol/qml/content/background.png
examples/declarative/ui-components/dialcontrol/qml/content/needle.png
examples/declarative/ui-components/dialcontrol/qml/content/needle_shadow.png
examples/declarative/ui-components/dialcontrol/qml/content/overlay.png
examples/declarative/ui-components/dialcontrol/qml/content/quit.png
examples/declarative/ui-components/dialcontrol/qml/dialcontrol.qmlproject
examples/declarative/ui-components/flipable/qml/content/5_heart.png
examples/declarative/ui-components/flipable/qml/content/9_club.png
examples/declarative/ui-components/flipable/qml/content/back.png
examples/declarative/ui-components/flipable/qml/flipable.qmlproject
examples/declarative/ui-components/main/qml/content/spinner-bg.png
examples/declarative/ui-components/main/qml/content/spinner-select.png
examples/declarative/ui-components/main/qml/images/clear.png
examples/declarative/ui-components/main/qml/images/lineedit-bg-focus.png
examples/declarative/ui-components/main/qml/images/lineedit-bg.png
examples/declarative/ui-components/main/qml/pics/niagara_falls.jpg
examples/declarative/ui-components/main/qml/progressbar.qmlproject
examples/declarative/ui-components/main/qml/scrollbar.qmlproject
examples/declarative/ui-components/main/qml/searchbox.qmlproject
examples/declarative/ui-components/main/qml/spinner.qmlproject
examples/declarative/ui-components/main/qml/tab.png
examples/declarative/ui-components/main/qml/tabwidget.qmlproject
examples/declarative/ui-components/progressbar/qml/content/background.png
examples/declarative/ui-components/progressbar/qml/progressbar.qmlproject
examples/declarative/ui-components/slideswitch/qml/content/background.svg
examples/declarative/ui-components/slideswitch/qml/content/knob.svg
examples/declarative/ui-components/slideswitch/qml/slideswitch.qmlproject
examples/declarative/xml/xmlhttprequest-example/qml/data.xml
examples/declarative/xml/xmlhttprequest-example/qml/xmlhttprequest.qmlproject
|
|
|
(4.7-generated-declarative branch).
|
