summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--demos/declarative/calculator/main.cpp62
-rw-r--r--demos/declarative/calculator/qml/calculator/CalculatorCore/Button.qml3
-rw-r--r--demos/declarative/calculator/qml/calculator/CalculatorCore/Display.qml3
-rw-r--r--demos/declarative/calculator/qml/calculator/calculator.qml3
-rw-r--r--demos/declarative/flickr/main.cpp62
-rw-r--r--demos/declarative/flickr/qml/flickr/common/Progress.qml3
-rw-r--r--demos/declarative/flickr/qml/flickr/common/RssModel.qml3
-rw-r--r--demos/declarative/flickr/qml/flickr/common/ScrollBar.qml3
-rw-r--r--demos/declarative/flickr/qml/flickr/common/Slider.qml3
-rw-r--r--demos/declarative/flickr/qml/flickr/flickr-90.qml3
-rw-r--r--demos/declarative/flickr/qml/flickr/flickr.qml3
-rw-r--r--demos/declarative/flickr/qml/flickr/mobile/Button.qml3
-rw-r--r--demos/declarative/flickr/qml/flickr/mobile/GridDelegate.qml3
-rw-r--r--demos/declarative/flickr/qml/flickr/mobile/ImageDetails.qml3
-rw-r--r--demos/declarative/flickr/qml/flickr/mobile/ListDelegate.qml3
-rw-r--r--demos/declarative/flickr/qml/flickr/mobile/TitleBar.qml3
-rw-r--r--demos/declarative/flickr/qml/flickr/mobile/ToolBar.qml3
-rw-r--r--demos/declarative/minehunt/main.cpp1
-rw-r--r--demos/declarative/minehunt/minehunt.cpp1
-rw-r--r--demos/declarative/minehunt/minehunt.h1
-rw-r--r--demos/declarative/minehunt/qml/minehunt/MinehuntCore/Explosion.qml3
-rw-r--r--demos/declarative/minehunt/qml/minehunt/MinehuntCore/Tile.qml3
-rw-r--r--demos/declarative/minehunt/qml/minehunt/minehunt.qml3
-rw-r--r--demos/declarative/photoviewer/main.cpp62
-rw-r--r--demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/AlbumDelegate.qml3
-rw-r--r--demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/BusyIndicator.qml3
-rw-r--r--demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/Button.qml3
-rw-r--r--demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/EditableButton.qml3
-rw-r--r--demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/PhotoDelegate.qml3
-rw-r--r--demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/ProgressBar.qml3
-rw-r--r--demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/RssModel.qml3
-rw-r--r--demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/Tag.qml3
-rw-r--r--demos/declarative/photoviewer/qml/photoviewer/photoviewer.qml3
-rw-r--r--demos/declarative/rssnews/main.cpp62
-rw-r--r--demos/declarative/rssnews/qml/rssnews/content/BusyIndicator.qml3
-rw-r--r--demos/declarative/rssnews/qml/rssnews/content/CategoryDelegate.qml3
-rw-r--r--demos/declarative/rssnews/qml/rssnews/content/NewsDelegate.qml3
-rw-r--r--demos/declarative/rssnews/qml/rssnews/content/RssFeeds.qml3
-rw-r--r--demos/declarative/rssnews/qml/rssnews/content/ScrollBar.qml3
-rw-r--r--demos/declarative/rssnews/qml/rssnews/rssnews.qml3
-rw-r--r--demos/declarative/samegame/main.cpp62
-rw-r--r--demos/declarative/samegame/qml/samegame/SamegameCore/BoomBlock.qml3
-rw-r--r--demos/declarative/samegame/qml/samegame/SamegameCore/Button.qml3
-rw-r--r--demos/declarative/samegame/qml/samegame/SamegameCore/Dialog.qml3
-rw-r--r--demos/declarative/samegame/qml/samegame/samegame.qml3
-rw-r--r--demos/declarative/snake/main.cpp62
-rw-r--r--demos/declarative/snake/qml/snake/content/Button.qml3
-rw-r--r--demos/declarative/snake/qml/snake/content/Cookie.qml3
-rw-r--r--demos/declarative/snake/qml/snake/content/HighScoreModel.qml3
-rw-r--r--demos/declarative/snake/qml/snake/content/Link.qml3
-rw-r--r--demos/declarative/snake/qml/snake/content/Skull.qml3
-rw-r--r--demos/declarative/snake/qml/snake/snake.qml3
-rw-r--r--demos/declarative/twitter/main.cpp62
-rw-r--r--demos/declarative/twitter/qml/twitter/TwitterCore/Button.qml3
-rw-r--r--demos/declarative/twitter/qml/twitter/TwitterCore/FatDelegate.qml3
-rw-r--r--demos/declarative/twitter/qml/twitter/TwitterCore/Input.qml3
-rw-r--r--demos/declarative/twitter/qml/twitter/TwitterCore/Loading.qml3
-rw-r--r--demos/declarative/twitter/qml/twitter/TwitterCore/MultiTitleBar.qml3
-rw-r--r--demos/declarative/twitter/qml/twitter/TwitterCore/RssModel.qml3
-rw-r--r--demos/declarative/twitter/qml/twitter/TwitterCore/SearchView.qml3
-rw-r--r--demos/declarative/twitter/qml/twitter/TwitterCore/TitleBar.qml3
-rw-r--r--demos/declarative/twitter/qml/twitter/TwitterCore/ToolBar.qml3
-rw-r--r--demos/declarative/twitter/qml/twitter/TwitterCore/UserModel.qml3
-rw-r--r--demos/declarative/twitter/qml/twitter/twitter.qml3
-rw-r--r--demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp56
-rw-r--r--demos/helper/qmlapplicationviewer/qmlapplicationviewer.h56
-rw-r--r--demos/mobile/guitartuner/src/application.qml56
-rw-r--r--demos/mobile/guitartuner/src/constants.h62
-rw-r--r--demos/mobile/guitartuner/src/fastfouriertransformer.cpp56
-rw-r--r--demos/mobile/guitartuner/src/fastfouriertransformer.h56
-rw-r--r--demos/mobile/guitartuner/src/fftpack.c1
-rw-r--r--demos/mobile/guitartuner/src/guitartuner.cpp56
-rw-r--r--demos/mobile/guitartuner/src/guitartuner.h56
-rw-r--r--demos/mobile/guitartuner/src/guitartunerui.cpp56
-rw-r--r--demos/mobile/guitartuner/src/guitartunerui.h56
-rw-r--r--demos/mobile/guitartuner/src/main.cpp62
-rw-r--r--demos/mobile/guitartuner/src/mycomponents/Adjuster.qml56
-rw-r--r--demos/mobile/guitartuner/src/mycomponents/Meter.qml56
-rw-r--r--demos/mobile/guitartuner/src/mycomponents/NoteButtonView.qml56
-rw-r--r--demos/mobile/guitartuner/src/mycomponents/NotesModel.qml56
-rw-r--r--demos/mobile/guitartuner/src/mycomponents/ToggleButton.qml56
-rw-r--r--demos/mobile/guitartuner/src/mycomponents/adjustbars.js1
-rw-r--r--demos/mobile/guitartuner/src/voiceanalyzer.cpp56
-rw-r--r--demos/mobile/guitartuner/src/voiceanalyzer.h56
-rw-r--r--demos/mobile/guitartuner/src/voicegenerator.cpp56
-rw-r--r--demos/mobile/guitartuner/src/voicegenerator.h56
-rw-r--r--demos/mobile/qtbubblelevel/accelerometerfilter.cpp56
-rw-r--r--demos/mobile/qtbubblelevel/accelerometerfilter.h56
-rw-r--r--demos/mobile/qtbubblelevel/main.cpp56
-rw-r--r--demos/mobile/qtbubblelevel/qml/BubbleLevel.qml56
-rw-r--r--demos/mobile/qtbubblelevel/qml/Button.qml56
-rw-r--r--demos/mobile/qtbubblelevel/qml/Tube.qml56
-rw-r--r--demos/mobile/qtbubblelevel/settings.h56
-rw-r--r--demos/mobile/qtbubblelevel/taskswitcher.cpp62
-rw-r--r--demos/mobile/qtbubblelevel/taskswitcher.h62
-rw-r--r--demos/mobile/quickhit/Button.qml56
-rw-r--r--demos/mobile/quickhit/Game.js1
-rw-r--r--demos/mobile/quickhit/Game.qml56
-rw-r--r--demos/mobile/quickhit/InvSounds.cpp56
-rw-r--r--demos/mobile/quickhit/InvSounds.h56
-rw-r--r--demos/mobile/quickhit/Menu.qml56
-rw-r--r--demos/mobile/quickhit/MenuItem.qml56
-rw-r--r--demos/mobile/quickhit/Message.qml56
-rw-r--r--demos/mobile/quickhit/Missile.qml56
-rw-r--r--demos/mobile/quickhit/MyShip.qml56
-rw-r--r--demos/mobile/quickhit/ga_src/GEAudioBuffer.cpp56
-rw-r--r--demos/mobile/quickhit/ga_src/GEAudioBuffer.h56
-rw-r--r--demos/mobile/quickhit/ga_src/GEAudioOut.cpp56
-rw-r--r--demos/mobile/quickhit/ga_src/GEAudioOut.h56
-rw-r--r--demos/mobile/quickhit/ga_src/GEInterfaces.cpp56
-rw-r--r--demos/mobile/quickhit/ga_src/GEInterfaces.h56
-rw-r--r--demos/mobile/quickhit/gameengine.cpp56
-rw-r--r--demos/mobile/quickhit/gameengine.h56
-rw-r--r--demos/mobile/quickhit/main.cpp56
-rw-r--r--demos/mobile/quickhit/mainwindow.cpp56
-rw-r--r--demos/mobile/quickhit/mainwindow.h56
-rw-r--r--demos/mobile/quickhit/myeventfilter.cpp56
-rw-r--r--demos/mobile/quickhit/myeventfilter.h62
-rw-r--r--demos/mobile/quickhit/plugins/LevelOne/Level.qml56
-rw-r--r--demos/mobile/quickhit/plugins/LevelOne/levelone.cpp56
-rw-r--r--demos/mobile/quickhit/plugins/LevelOne/levelone.h56
-rw-r--r--demos/mobile/quickhit/plugins/LevelTemplate/leveltemplate.cpp56
-rw-r--r--demos/mobile/quickhit/plugins/LevelTemplate/leveltemplate.h56
-rw-r--r--demos/mobile/quickhit/plugins/LevelTemplate/qml/Enemy.qml62
-rw-r--r--demos/mobile/quickhit/plugins/LevelTemplate/qml/Level.js1
-rw-r--r--demos/mobile/quickhit/plugins/LevelTemplate/qml/Level.qml56
-rw-r--r--demos/mobile/quickhit/plugins/LevelTwo/leveltwo.cpp56
-rw-r--r--demos/mobile/quickhit/plugins/LevelTwo/leveltwo.h56
-rw-r--r--demos/mobile/quickhit/plugins/LevelTwo/qml/Enemy.qml56
-rw-r--r--demos/mobile/quickhit/plugins/LevelTwo/qml/Level.js1
-rw-r--r--demos/mobile/quickhit/plugins/LevelTwo/qml/Level.qml56
-rw-r--r--demos/mobile/quickhit/plugins/levelplugininterface.h56
-rw-r--r--doc/src/declarative/advtutorial.qdoc1
-rw-r--r--doc/src/declarative/anchor-layout.qdoc1
-rw-r--r--doc/src/declarative/animation.qdoc1
-rw-r--r--doc/src/declarative/basicelements.qdoc1
-rw-r--r--doc/src/declarative/basictypes.qdoc1
-rw-r--r--doc/src/declarative/behaviors-and-states.qdoc1
-rw-r--r--doc/src/declarative/codingconventions.qdoc1
-rw-r--r--doc/src/declarative/declarativeui.qdoc1
-rw-r--r--doc/src/declarative/dynamicobjects.qdoc1
-rw-r--r--doc/src/declarative/elements.qdoc1
-rw-r--r--doc/src/declarative/example-slideswitch.qdoc1
-rw-r--r--doc/src/declarative/examples.qdoc1
-rw-r--r--doc/src/declarative/extending-tutorial.qdoc1
-rw-r--r--doc/src/declarative/extending.qdoc1
-rw-r--r--doc/src/declarative/focus.qdoc1
-rw-r--r--doc/src/declarative/globalobject.qdoc1
-rw-r--r--doc/src/declarative/integrating.qdoc1
-rw-r--r--doc/src/declarative/javascriptblocks.qdoc1
-rw-r--r--doc/src/declarative/modules.qdoc1
-rw-r--r--doc/src/declarative/mouseevents.qdoc1
-rw-r--r--doc/src/declarative/network.qdoc1
-rw-r--r--doc/src/declarative/positioners.qdoc1
-rw-r--r--doc/src/declarative/propertybinding.qdoc1
-rw-r--r--doc/src/declarative/qdeclarativedebugging.qdoc1
-rw-r--r--doc/src/declarative/qdeclarativedocument.qdoc1
-rw-r--r--doc/src/declarative/qdeclarativei18n.qdoc1
-rw-r--r--doc/src/declarative/qdeclarativeintro.qdoc1
-rw-r--r--doc/src/declarative/qdeclarativemodels.qdoc1
-rw-r--r--doc/src/declarative/qdeclarativeperformance.qdoc1
-rw-r--r--doc/src/declarative/qdeclarativesecurity.qdoc1
-rw-r--r--doc/src/declarative/qdeclarativestates.qdoc1
-rw-r--r--doc/src/declarative/qmlevents.qdoc1
-rw-r--r--doc/src/declarative/qmlinuse.qdoc1
-rw-r--r--doc/src/declarative/qmlreusablecomponents.qdoc1
-rw-r--r--doc/src/declarative/qmlruntime.qdoc1
-rw-r--r--doc/src/declarative/qmlsyntax.qdoc1
-rw-r--r--doc/src/declarative/qmltexthandling.qdoc1
-rw-r--r--doc/src/declarative/qmlviewer.qdoc1
-rw-r--r--doc/src/declarative/qmlviews.qdoc1
-rw-r--r--doc/src/declarative/qmlwebkit.qdoc1
-rw-r--r--doc/src/declarative/qtbinding.qdoc1
-rw-r--r--doc/src/declarative/qtdeclarative.qdoc1
-rw-r--r--doc/src/declarative/qtprogrammers.qdoc1
-rw-r--r--doc/src/declarative/qtquick-intro.qdoc1
-rw-r--r--doc/src/declarative/righttoleft.qdoc1
-rw-r--r--doc/src/declarative/scope.qdoc1
-rw-r--r--doc/src/declarative/tutorial.qdoc1
-rw-r--r--doc/src/declarative/whatsnew.qdoc1
-rw-r--r--doc/src/demos/qml-qtbubblelevel.qdoc1
-rw-r--r--doc/src/examples/qml-calculator.qdoc1
-rw-r--r--doc/src/examples/qml-examples.qdoc1
-rw-r--r--doc/src/examples/qml-extending.qdoc1
-rw-r--r--doc/src/examples/qml-flickr.qdoc1
-rw-r--r--doc/src/examples/qml-folderlistmodel.qdoc1
-rw-r--r--doc/src/examples/qml-minehunt.qdoc1
-rw-r--r--doc/src/examples/qml-photoviewer.qdoc1
-rw-r--r--doc/src/examples/qml-rssnews.qdoc1
-rw-r--r--doc/src/examples/qml-samegame.qdoc1
-rw-r--r--doc/src/examples/qml-snake.qdoc1
-rw-r--r--doc/src/examples/qml-twitter.qdoc1
-rw-r--r--doc/src/examples/qml-webbrowser.qdoc1
-rw-r--r--doc/src/getting-started/gettingstartedqml.qdoc1
-rw-r--r--doc/src/howtos/qmlbestpractices/qmlbestpractices-coding.qdoc1
-rw-r--r--doc/src/howtos/qmlbestpractices/qmlbestpractices-datatypes.qdoc1
-rw-r--r--doc/src/legal/qtquicklicense.qdoc1
-rw-r--r--doc/src/snippets/declarative/Button.qml1
-rw-r--r--doc/src/snippets/declarative/SelfDestroyingRect.qml1
-rw-r--r--doc/src/snippets/declarative/Sprite.qml1
-rw-r--r--doc/src/snippets/declarative/anchoranimation.qml1
-rw-r--r--doc/src/snippets/declarative/anchorchanges.qml1
-rw-r--r--doc/src/snippets/declarative/animatedimage.qml1
-rw-r--r--doc/src/snippets/declarative/animation.qml1
-rw-r--r--doc/src/snippets/declarative/application.qml1
-rw-r--r--doc/src/snippets/declarative/behavior.qml1
-rw-r--r--doc/src/snippets/declarative/bestpractices/group.qml1
-rw-r--r--doc/src/snippets/declarative/borderimage/borderimage-defaults.qml1
-rw-r--r--doc/src/snippets/declarative/borderimage/borderimage-scaled.qml1
-rw-r--r--doc/src/snippets/declarative/borderimage/borderimage-tiled.qml1
-rw-r--r--doc/src/snippets/declarative/borderimage/normal-image.qml1
-rw-r--r--doc/src/snippets/declarative/codingconventions/dotproperties.qml1
-rw-r--r--doc/src/snippets/declarative/codingconventions/javascript-imports.qml1
-rw-r--r--doc/src/snippets/declarative/codingconventions/javascript.qml1
-rw-r--r--doc/src/snippets/declarative/codingconventions/lists.qml1
-rw-r--r--doc/src/snippets/declarative/codingconventions/photo.qml1
-rw-r--r--doc/src/snippets/declarative/codingconventions/private.qml1
-rw-r--r--doc/src/snippets/declarative/coloranimation.qml1
-rw-r--r--doc/src/snippets/declarative/colors.qml1
-rw-r--r--doc/src/snippets/declarative/column/column.qml1
-rw-r--r--doc/src/snippets/declarative/column/vertical-positioner-transition.qml1
-rw-r--r--doc/src/snippets/declarative/column/vertical-positioner.qml1
-rw-r--r--doc/src/snippets/declarative/comments.qml1
-rw-r--r--doc/src/snippets/declarative/component.qml1
-rw-r--r--doc/src/snippets/declarative/createComponent-simple.qml1
-rw-r--r--doc/src/snippets/declarative/createComponent.qml1
-rw-r--r--doc/src/snippets/declarative/createQmlObject.qml1
-rw-r--r--doc/src/snippets/declarative/dynamicObjects-destroy.qml1
-rw-r--r--doc/src/snippets/declarative/events.qml1
-rw-r--r--doc/src/snippets/declarative/flickable.qml1
-rw-r--r--doc/src/snippets/declarative/flickableScrollbar.qml1
-rw-r--r--doc/src/snippets/declarative/flipable/flipable.qml1
-rw-r--r--doc/src/snippets/declarative/flow-diagram.qml1
-rw-r--r--doc/src/snippets/declarative/flow.qml1
-rw-r--r--doc/src/snippets/declarative/focus/advancedFocus.qml1
-rw-r--r--doc/src/snippets/declarative/focus/basicwidget.qml1
-rw-r--r--doc/src/snippets/declarative/focus/clickablewidget.qml3
-rw-r--r--doc/src/snippets/declarative/focus/focusColumn.qml1
-rw-r--r--doc/src/snippets/declarative/focus/focusscopewidget.qml1
-rw-r--r--doc/src/snippets/declarative/focus/myclickablewidget.qml1
-rw-r--r--doc/src/snippets/declarative/focus/myfocusscopewidget.qml1
-rw-r--r--doc/src/snippets/declarative/focus/mywidget.qml1
-rw-r--r--doc/src/snippets/declarative/focus/rectangle.qml3
-rw-r--r--doc/src/snippets/declarative/focus/widget.qml1
-rw-r--r--doc/src/snippets/declarative/focusscopes.qml1
-rw-r--r--doc/src/snippets/declarative/folderlistmodel.qml1
-rw-r--r--doc/src/snippets/declarative/gradient.qml1
-rw-r--r--doc/src/snippets/declarative/grid-spacing.qml1
-rw-r--r--doc/src/snippets/declarative/grid/grid-items.qml1
-rw-r--r--doc/src/snippets/declarative/grid/grid-no-spacing.qml1
-rw-r--r--doc/src/snippets/declarative/grid/grid-spacing.qml1
-rw-r--r--doc/src/snippets/declarative/grid/grid.qml1
-rw-r--r--doc/src/snippets/declarative/gridview/ContactModel.qml1
-rw-r--r--doc/src/snippets/declarative/gridview/gridview.qml1
-rw-r--r--doc/src/snippets/declarative/image.qml1
-rw-r--r--doc/src/snippets/declarative/imports/best-practices.qml1
-rw-r--r--doc/src/snippets/declarative/imports/chart.qml1
-rw-r--r--doc/src/snippets/declarative/imports/installed-module.qml1
-rw-r--r--doc/src/snippets/declarative/imports/merged-named-imports.qml1
-rw-r--r--doc/src/snippets/declarative/imports/named-imports.qml1
-rw-r--r--doc/src/snippets/declarative/imports/network-imports.qml1
-rw-r--r--doc/src/snippets/declarative/imports/qtquick-1.0.qml1
-rw-r--r--doc/src/snippets/declarative/imports/timeexample.qml1
-rw-r--r--doc/src/snippets/declarative/integrating-javascript/connectjs.qml1
-rw-r--r--doc/src/snippets/declarative/integrating-javascript/includejs/app.qml1
-rw-r--r--doc/src/snippets/declarative/integrating-javascript/includejs/factorial.js1
-rw-r--r--doc/src/snippets/declarative/integrating-javascript/includejs/script.js1
-rw-r--r--doc/src/snippets/declarative/integrating-javascript/script.js1
-rw-r--r--doc/src/snippets/declarative/keynavigation.qml1
-rw-r--r--doc/src/snippets/declarative/keys/keys-handler.qml1
-rw-r--r--doc/src/snippets/declarative/keys/keys-pressed.qml1
-rw-r--r--doc/src/snippets/declarative/layoutmirroring.qml1
-rw-r--r--doc/src/snippets/declarative/listmodel-modify.qml1
-rw-r--r--doc/src/snippets/declarative/listmodel-nested.qml1
-rw-r--r--doc/src/snippets/declarative/listmodel-simple.qml1
-rw-r--r--doc/src/snippets/declarative/listmodel.qml1
-rw-r--r--doc/src/snippets/declarative/listview-decorations.qml1
-rw-r--r--doc/src/snippets/declarative/listview-sections.qml1
-rw-r--r--doc/src/snippets/declarative/listview.qml1
-rw-r--r--doc/src/snippets/declarative/listview/ContactModel.qml1
-rw-r--r--doc/src/snippets/declarative/listview/listview-snippet.qml1
-rw-r--r--doc/src/snippets/declarative/listview/listview.qml1
-rw-r--r--doc/src/snippets/declarative/loader/KeyReader.qml56
-rw-r--r--doc/src/snippets/declarative/loader/MyItem.qml56
-rw-r--r--doc/src/snippets/declarative/loader/connections.qml56
-rw-r--r--doc/src/snippets/declarative/loader/focus.qml56
-rw-r--r--doc/src/snippets/declarative/loader/simple.qml56
-rw-r--r--doc/src/snippets/declarative/loader/sizeitem.qml56
-rw-r--r--doc/src/snippets/declarative/loader/sizeloader.qml56
-rw-r--r--doc/src/snippets/declarative/models/views-models-delegates.qml1
-rw-r--r--doc/src/snippets/declarative/models/visual-model-and-view.qml1
-rw-r--r--doc/src/snippets/declarative/mousearea/mousearea-snippet.qml1
-rw-r--r--doc/src/snippets/declarative/mousearea/mousearea.qml1
-rw-r--r--doc/src/snippets/declarative/mousearea/mouseareadragfilter.qml1
-rw-r--r--doc/src/snippets/declarative/numberanimation.qml1
-rw-r--r--doc/src/snippets/declarative/parallelanimation.qml1
-rw-r--r--doc/src/snippets/declarative/parentanimation.qml1
-rw-r--r--doc/src/snippets/declarative/parentchange.qml1
-rw-r--r--doc/src/snippets/declarative/pathview/ContactModel.qml1
-rw-r--r--doc/src/snippets/declarative/pathview/pathattributes.qml1
-rw-r--r--doc/src/snippets/declarative/pathview/pathview.qml1
-rw-r--r--doc/src/snippets/declarative/properties.qml1
-rw-r--r--doc/src/snippets/declarative/propertyaction-sequential.qml1
-rw-r--r--doc/src/snippets/declarative/propertyaction.qml1
-rw-r--r--doc/src/snippets/declarative/propertyanimation.qml1
-rw-r--r--doc/src/snippets/declarative/propertychanges.qml1
-rw-r--r--doc/src/snippets/declarative/qml-data-models/dynamic-listmodel.qml1
-rw-r--r--doc/src/snippets/declarative/qml-data-models/listelements.qml1
-rw-r--r--doc/src/snippets/declarative/qml-data-models/listmodel-listview.qml1
-rw-r--r--doc/src/snippets/declarative/qml-documents/inline-component.qml1
-rw-r--r--doc/src/snippets/declarative/qml-documents/inline-text-component.qml1
-rw-r--r--doc/src/snippets/declarative/qml-documents/non-trivial.qml1
-rw-r--r--doc/src/snippets/declarative/qml-documents/qmldocuments.qml1
-rw-r--r--doc/src/snippets/declarative/qml-extending-types/components/Button.qml1
-rw-r--r--doc/src/snippets/declarative/qml-extending-types/components/application.qml1
-rw-r--r--doc/src/snippets/declarative/qml-extending-types/methods/app.qml1
-rw-r--r--doc/src/snippets/declarative/qml-extending-types/properties/ImageViewer.qml1
-rw-r--r--doc/src/snippets/declarative/qml-extending-types/properties/alias-override.qml1
-rw-r--r--doc/src/snippets/declarative/qml-extending-types/properties/alias.qml1
-rw-r--r--doc/src/snippets/declarative/qml-extending-types/properties/alias/ImageViewer.qml1
-rw-r--r--doc/src/snippets/declarative/qml-extending-types/properties/alias/application.qml1
-rw-r--r--doc/src/snippets/declarative/qml-extending-types/properties/application.qml1
-rw-r--r--doc/src/snippets/declarative/qml-extending-types/properties/property-signals.qml1
-rw-r--r--doc/src/snippets/declarative/qml-extending-types/signals/Button.qml1
-rw-r--r--doc/src/snippets/declarative/qml-extending-types/signals/basic.qml1
-rw-r--r--doc/src/snippets/declarative/qml-extending-types/signals/connectdynamic.qml1
-rw-r--r--doc/src/snippets/declarative/qml-extending-types/signals/connectslots.qml1
-rw-r--r--doc/src/snippets/declarative/qml-extending-types/signals/no-parameters.qml1
-rw-r--r--doc/src/snippets/declarative/qml-extending-types/signals/parameters.qml1
-rw-r--r--doc/src/snippets/declarative/qtbinding/context-advanced/MyItem.qml1
-rw-r--r--doc/src/snippets/declarative/qtbinding/context-advanced/applicationdata.h1
-rw-r--r--doc/src/snippets/declarative/qtbinding/context-advanced/connections.qml1
-rw-r--r--doc/src/snippets/declarative/qtbinding/context-advanced/main.cpp1
-rw-r--r--doc/src/snippets/declarative/qtbinding/context/MyItem.qml1
-rw-r--r--doc/src/snippets/declarative/qtbinding/context/main.cpp1
-rw-r--r--doc/src/snippets/declarative/qtbinding/enums/imageviewer.h1
-rw-r--r--doc/src/snippets/declarative/qtbinding/enums/main.cpp1
-rw-r--r--doc/src/snippets/declarative/qtbinding/enums/standalone.qml1
-rw-r--r--doc/src/snippets/declarative/qtbinding/functions-cpp/MyItem.qml1
-rw-r--r--doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp1
-rw-r--r--doc/src/snippets/declarative/qtbinding/functions-cpp/myclass.h1
-rw-r--r--doc/src/snippets/declarative/qtbinding/functions-qml/MyItem.qml1
-rw-r--r--doc/src/snippets/declarative/qtbinding/functions-qml/main.cpp1
-rw-r--r--doc/src/snippets/declarative/qtbinding/loading/MyItem.qml1
-rw-r--r--doc/src/snippets/declarative/qtbinding/loading/main.cpp1
-rw-r--r--doc/src/snippets/declarative/qtbinding/newelements/imageviewer.h1
-rw-r--r--doc/src/snippets/declarative/qtbinding/newelements/main.cpp1
-rw-r--r--doc/src/snippets/declarative/qtbinding/newelements/standalone.qml1
-rw-r--r--doc/src/snippets/declarative/qtbinding/properties-cpp/MyItem.qml1
-rw-r--r--doc/src/snippets/declarative/qtbinding/properties-cpp/applicationdata.h1
-rw-r--r--doc/src/snippets/declarative/qtbinding/properties-cpp/main.cpp1
-rw-r--r--doc/src/snippets/declarative/qtbinding/properties-qml/MyItem.qml1
-rw-r--r--doc/src/snippets/declarative/qtbinding/properties-qml/main.cpp1
-rw-r--r--doc/src/snippets/declarative/qtbinding/resources/main.cpp1
-rw-r--r--doc/src/snippets/declarative/qtbinding/resources/main.qml1
-rw-r--r--doc/src/snippets/declarative/qtbinding/signals-cpp/MyItem.qml1
-rw-r--r--doc/src/snippets/declarative/qtbinding/signals-cpp/imageviewer.h1
-rw-r--r--doc/src/snippets/declarative/qtbinding/signals-cpp/main.cpp1
-rw-r--r--doc/src/snippets/declarative/qtbinding/signals-cpp/standalone.qml1
-rw-r--r--doc/src/snippets/declarative/qtbinding/signals-qml/MyItem.qml1
-rw-r--r--doc/src/snippets/declarative/qtbinding/signals-qml/main.cpp1
-rw-r--r--doc/src/snippets/declarative/qtbinding/signals-qml/myclass.h1
-rw-r--r--doc/src/snippets/declarative/qtbinding/variantlistmap/MyItem.qml1
-rw-r--r--doc/src/snippets/declarative/qtbinding/variantlistmap/main.cpp1
-rw-r--r--doc/src/snippets/declarative/qtobject.qml1
-rw-r--r--doc/src/snippets/declarative/rectangle/rect-border-width.qml1
-rw-r--r--doc/src/snippets/declarative/rectangle/rectangle-colors.qml1
-rw-r--r--doc/src/snippets/declarative/rectangle/rectangle-gradient.qml1
-rw-r--r--doc/src/snippets/declarative/rectangle/rectangle-smooth.qml1
-rw-r--r--doc/src/snippets/declarative/rectangle/rectangle.qml1
-rw-r--r--doc/src/snippets/declarative/repeaters/repeater-grid-index.qml1
-rw-r--r--doc/src/snippets/declarative/repeaters/repeater.qml1
-rw-r--r--doc/src/snippets/declarative/reusablecomponents/Button.qml1
-rw-r--r--doc/src/snippets/declarative/reusablecomponents/application.qml1
-rw-r--r--doc/src/snippets/declarative/reusablecomponents/component.qml1
-rw-r--r--doc/src/snippets/declarative/reusablecomponents/focusbutton.qml1
-rw-r--r--doc/src/snippets/declarative/righttoleft.qml1
-rw-r--r--doc/src/snippets/declarative/righttoleft/Child.qml1
-rw-r--r--doc/src/snippets/declarative/rotation.qml1
-rw-r--r--doc/src/snippets/declarative/rotationanimation.qml1
-rw-r--r--doc/src/snippets/declarative/row.qml1
-rw-r--r--doc/src/snippets/declarative/row/row.qml1
-rw-r--r--doc/src/snippets/declarative/sequentialanimation.qml1
-rw-r--r--doc/src/snippets/declarative/smoothedanimation.qml1
-rw-r--r--doc/src/snippets/declarative/springanimation.qml1
-rw-r--r--doc/src/snippets/declarative/state-when.qml1
-rw-r--r--doc/src/snippets/declarative/state.qml1
-rw-r--r--doc/src/snippets/declarative/states.qml1
-rw-r--r--doc/src/snippets/declarative/states/statechangescript.qml1
-rw-r--r--doc/src/snippets/declarative/systempalette.qml1
-rw-r--r--doc/src/snippets/declarative/text/onLinkActivated.qml3
-rw-r--r--doc/src/snippets/declarative/texteditor.qml1
-rw-r--r--doc/src/snippets/declarative/texthandling.qml1
-rw-r--r--doc/src/snippets/declarative/transition-from-to-modified.qml1
-rw-r--r--doc/src/snippets/declarative/transition-from-to.qml1
-rw-r--r--doc/src/snippets/declarative/transition-reversible.qml1
-rw-r--r--doc/src/snippets/declarative/transition.qml1
-rw-r--r--doc/src/snippets/declarative/transitions-list.qml1
-rw-r--r--doc/src/snippets/declarative/visualdatamodel.qml1
-rw-r--r--doc/src/snippets/declarative/visualdatamodel_rootindex/main.cpp3
-rw-r--r--doc/src/snippets/declarative/visualdatamodel_rootindex/view.qml1
-rw-r--r--doc/src/snippets/declarative/webview/webview.qml1
-rw-r--r--doc/src/snippets/declarative/workerscript.qml1
-rw-r--r--doc/src/snippets/declarative/xmlrole.qml1
-rw-r--r--examples/declarative/animation/basics/color-animation/main.cpp3
-rw-r--r--examples/declarative/animation/basics/color-animation/qml/color-animation/color-animation.qml1
-rw-r--r--examples/declarative/animation/basics/property-animation/main.cpp3
-rw-r--r--examples/declarative/animation/basics/property-animation/qml/property-animation/property-animation.qml1
-rw-r--r--examples/declarative/animation/behaviors/behavior-example/main.cpp3
-rw-r--r--examples/declarative/animation/behaviors/behavior-example/qml/behaviours/SideRect.qml1
-rw-r--r--examples/declarative/animation/behaviors/behavior-example/qml/behaviours/behavior-example.qml1
-rw-r--r--examples/declarative/animation/behaviors/wigglytext/main.cpp3
-rw-r--r--examples/declarative/animation/behaviors/wigglytext/qml/wigglytext/wigglytext.qml1
-rw-r--r--examples/declarative/animation/easing/easing.qml1
-rw-r--r--examples/declarative/animation/easing/main.cpp3
-rw-r--r--examples/declarative/animation/easing/qml/easing/content/QuitButton.qml1
-rw-r--r--examples/declarative/animation/easing/qml/easing/easing.qml1
-rw-r--r--examples/declarative/animation/states/main.cpp3
-rw-r--r--examples/declarative/animation/states/qml/states/states.qml1
-rw-r--r--examples/declarative/animation/states/qml/states/transitions.qml1
-rw-r--r--examples/declarative/cppextensions/imageprovider/imageprovider-example.qml1
-rw-r--r--examples/declarative/cppextensions/imageprovider/imageprovider.cpp3
-rw-r--r--examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp3
-rw-r--r--examples/declarative/cppextensions/networkaccessmanagerfactory/qml/networkaccessmanagerfactory/view.qml1
-rw-r--r--examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml1
-rw-r--r--examples/declarative/cppextensions/plugins/plugin.cpp1
-rw-r--r--examples/declarative/cppextensions/plugins/plugins.qml1
-rw-r--r--examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qml1
-rw-r--r--examples/declarative/cppextensions/qgraphicslayouts/layoutitem/main.cpp1
-rw-r--r--examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.cpp1
-rw-r--r--examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.h1
-rw-r--r--examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/main.cpp3
-rw-r--r--examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qml/qgraphicsgridlayout/qgraphicsgridlayout.qml1
-rw-r--r--examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.cpp1
-rw-r--r--examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.h1
-rw-r--r--examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/main.cpp3
-rw-r--r--examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qml/qgraphicslinearlayout/qgraphicslinearlayout.qml1
-rw-r--r--examples/declarative/cppextensions/qwidgets/qwidgets.cpp1
-rw-r--r--examples/declarative/cppextensions/qwidgets/qwidgets.qml1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/adding/example.qml1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/adding/main.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/adding/person.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/adding/person.h1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.h1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/attached/example.qml1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/attached/main.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/attached/person.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/attached/person.h1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.h1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/binding/example.qml1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.h1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/binding/main.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/binding/person.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/binding/person.h1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.h1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/coercion/example.qml1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/coercion/main.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/coercion/person.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/coercion/person.h1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/default/birthdayparty.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/default/birthdayparty.h1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/default/example.qml1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/default/main.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/default/person.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/default/person.h1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/extended/example.qml1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/extended/lineedit.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/extended/lineedit.h1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/extended/main.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.h1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/grouped/example.qml1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/grouped/main.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/grouped/person.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/grouped/person.h1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/methods/birthdayparty.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/methods/birthdayparty.h1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/methods/example.qml1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/methods/main.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/methods/person.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/methods/person.h1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/properties/example.qml1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/properties/main.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/properties/person.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/properties/person.h1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.h1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/signal/example.qml1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/signal/main.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/signal/person.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/signal/person.h1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.h1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/valuesource/example.qml1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.h1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/valuesource/main.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/valuesource/person.cpp1
-rw-r--r--examples/declarative/cppextensions/referenceexamples/valuesource/person.h1
-rw-r--r--examples/declarative/i18n/main.cpp3
-rw-r--r--examples/declarative/i18n/qml/i18n/i18n.qml1
-rw-r--r--examples/declarative/imageelements/borderimage/main.cpp3
-rw-r--r--examples/declarative/imageelements/borderimage/qml/borderimage/borderimage.qml1
-rw-r--r--examples/declarative/imageelements/borderimage/qml/borderimage/content/MyBorderImage.qml1
-rw-r--r--examples/declarative/imageelements/borderimage/qml/borderimage/content/ShadowRectangle.qml1
-rw-r--r--examples/declarative/imageelements/borderimage/qml/borderimage/shadows.qml1
-rw-r--r--examples/declarative/imageelements/image/main.cpp3
-rw-r--r--examples/declarative/imageelements/image/qml/image/ImageCell.qml1
-rw-r--r--examples/declarative/imageelements/image/qml/image/image.qml1
-rw-r--r--examples/declarative/imageelements/shadows/main.cpp3
-rw-r--r--examples/declarative/imageelements/shadows/qml/shadows/borderimage.qml1
-rw-r--r--examples/declarative/imageelements/shadows/qml/shadows/content/MyBorderImage.qml1
-rw-r--r--examples/declarative/imageelements/shadows/qml/shadows/content/ShadowRectangle.qml1
-rw-r--r--examples/declarative/imageelements/shadows/qml/shadows/shadows.qml1
-rw-r--r--examples/declarative/keyinteraction/focus/main.cpp3
-rw-r--r--examples/declarative/keyinteraction/focus/qml/focus/FocusCore/ContextMenu.qml1
-rw-r--r--examples/declarative/keyinteraction/focus/qml/focus/FocusCore/GridMenu.qml1
-rw-r--r--examples/declarative/keyinteraction/focus/qml/focus/FocusCore/ListMenu.qml1
-rw-r--r--examples/declarative/keyinteraction/focus/qml/focus/FocusCore/ListViewDelegate.qml1
-rw-r--r--examples/declarative/keyinteraction/focus/qml/focus/focus.qml1
-rw-r--r--examples/declarative/modelviews/abstractitemmodel/main.cpp1
-rw-r--r--examples/declarative/modelviews/abstractitemmodel/model.cpp1
-rw-r--r--examples/declarative/modelviews/abstractitemmodel/model.h1
-rw-r--r--examples/declarative/modelviews/abstractitemmodel/qml/abstractitemmodel/view.qml1
-rw-r--r--examples/declarative/modelviews/gridview/main.cpp3
-rw-r--r--examples/declarative/modelviews/gridview/qml/gridview-example/gridview-example.qml1
-rw-r--r--examples/declarative/modelviews/listview/dynamiclist/main.cpp3
-rw-r--r--examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/content/PetsModel.qml1
-rw-r--r--examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/content/PressAndHoldButton.qml1
-rw-r--r--examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/content/RecipesModel.qml1
-rw-r--r--examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/content/TextButton.qml1
-rw-r--r--examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/dynamiclist.qml1
-rw-r--r--examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/expandingdelegates.qml1
-rw-r--r--examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/highlight.qml1
-rw-r--r--examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/highlightranges.qml1
-rw-r--r--examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/sections.qml1
-rw-r--r--examples/declarative/modelviews/listview/expandingdelegates/main.cpp3
-rw-r--r--examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/content/PetsModel.qml1
-rw-r--r--examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/content/PressAndHoldButton.qml1
-rw-r--r--examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/content/RecipesModel.qml1
-rw-r--r--examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/content/TextButton.qml1
-rw-r--r--examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/dynamiclist.qml1
-rw-r--r--examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/expandingdelegates.qml1
-rw-r--r--examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/highlight.qml1
-rw-r--r--examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/highlightranges.qml1
-rw-r--r--examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/sections.qml1
-rw-r--r--examples/declarative/modelviews/listview/highlight/main.cpp3
-rw-r--r--examples/declarative/modelviews/listview/highlight/qml/highlight/content/PetsModel.qml1
-rw-r--r--examples/declarative/modelviews/listview/highlight/qml/highlight/content/PressAndHoldButton.qml1
-rw-r--r--examples/declarative/modelviews/listview/highlight/qml/highlight/content/RecipesModel.qml1
-rw-r--r--examples/declarative/modelviews/listview/highlight/qml/highlight/content/TextButton.qml1
-rw-r--r--examples/declarative/modelviews/listview/highlight/qml/highlight/dynamiclist.qml1
-rw-r--r--examples/declarative/modelviews/listview/highlight/qml/highlight/expandingdelegates.qml1
-rw-r--r--examples/declarative/modelviews/listview/highlight/qml/highlight/highlight.qml1
-rw-r--r--examples/declarative/modelviews/listview/highlight/qml/highlight/highlightranges.qml1
-rw-r--r--examples/declarative/modelviews/listview/highlight/qml/highlight/sections.qml1
-rw-r--r--examples/declarative/modelviews/listview/highlightranges/main.cpp3
-rw-r--r--examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/content/PetsModel.qml1
-rw-r--r--examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/content/PressAndHoldButton.qml1
-rw-r--r--examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/content/RecipesModel.qml1
-rw-r--r--examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/content/TextButton.qml1
-rw-r--r--examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/dynamiclist.qml1
-rw-r--r--examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/expandingdelegates.qml1
-rw-r--r--examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/highlight.qml1
-rw-r--r--examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/highlightranges.qml1
-rw-r--r--examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/sections.qml1
-rw-r--r--examples/declarative/modelviews/listview/sections/main.cpp3
-rw-r--r--examples/declarative/modelviews/listview/sections/qml/sections/content/PetsModel.qml1
-rw-r--r--examples/declarative/modelviews/listview/sections/qml/sections/content/PressAndHoldButton.qml1
-rw-r--r--examples/declarative/modelviews/listview/sections/qml/sections/content/RecipesModel.qml1
-rw-r--r--examples/declarative/modelviews/listview/sections/qml/sections/content/TextButton.qml1
-rw-r--r--examples/declarative/modelviews/listview/sections/qml/sections/dynamiclist.qml1
-rw-r--r--examples/declarative/modelviews/listview/sections/qml/sections/expandingdelegates.qml1
-rw-r--r--examples/declarative/modelviews/listview/sections/qml/sections/highlight.qml1
-rw-r--r--examples/declarative/modelviews/listview/sections/qml/sections/highlightranges.qml1
-rw-r--r--examples/declarative/modelviews/listview/sections/qml/sections/sections.qml1
-rw-r--r--examples/declarative/modelviews/objectlistmodel/dataobject.cpp1
-rw-r--r--examples/declarative/modelviews/objectlistmodel/dataobject.h1
-rw-r--r--examples/declarative/modelviews/objectlistmodel/main.cpp3
-rw-r--r--examples/declarative/modelviews/objectlistmodel/qml/objectlistmodel/view.qml1
-rw-r--r--examples/declarative/modelviews/package/main.cpp1
-rw-r--r--examples/declarative/modelviews/package/qml/package/Delegate.qml1
-rw-r--r--examples/declarative/modelviews/package/qml/package/view.qml1
-rw-r--r--examples/declarative/modelviews/parallax/main.cpp1
-rw-r--r--examples/declarative/modelviews/parallax/qml/parallax/Clock.qml1
-rw-r--r--examples/declarative/modelviews/parallax/qml/parallax/ParallaxView.qml1
-rw-r--r--examples/declarative/modelviews/parallax/qml/parallax/Smiley.qml1
-rw-r--r--examples/declarative/modelviews/parallax/qml/parallax/parallax.qml1
-rw-r--r--examples/declarative/modelviews/pathview/main.cpp3
-rw-r--r--examples/declarative/modelviews/pathview/qml/pathview-example/pathview-example.qml1
-rw-r--r--examples/declarative/modelviews/stringlistmodel/main.cpp3
-rw-r--r--examples/declarative/modelviews/stringlistmodel/qml/stringlistmodel/view.qml1
-rw-r--r--examples/declarative/modelviews/visualitemmodel/main.cpp3
-rw-r--r--examples/declarative/modelviews/visualitemmodel/qml/visualitemmodel/visualitemmodel.qml1
-rw-r--r--examples/declarative/positioners/main.cpp3
-rw-r--r--examples/declarative/positioners/qml/positioners/Button.qml1
-rw-r--r--examples/declarative/positioners/qml/positioners/positioners.qml1
-rw-r--r--examples/declarative/righttoleft/layoutdirection/main.cpp1
-rw-r--r--examples/declarative/righttoleft/layoutdirection/qml/layoutdirection/layoutdirection.qml1
-rw-r--r--examples/declarative/righttoleft/layoutmirroring/main.cpp1
-rw-r--r--examples/declarative/righttoleft/layoutmirroring/qml/layoutmirroring/layoutmirroring.qml1
-rw-r--r--examples/declarative/righttoleft/textalignment/main.cpp1
-rw-r--r--examples/declarative/righttoleft/textalignment/qml/textalignment/textalignment.qml1
-rw-r--r--examples/declarative/screenorientation/Core/Bubble.qml1
-rw-r--r--examples/declarative/screenorientation/Core/Button.qml1
-rw-r--r--examples/declarative/screenorientation/Core/screenorientation.js1
-rw-r--r--examples/declarative/screenorientation/screenorientation.qml1
-rw-r--r--examples/declarative/shadereffects/main.cpp52
-rw-r--r--examples/declarative/shadereffects/qml/shadereffects/Curtain.qml52
-rw-r--r--examples/declarative/shadereffects/qml/shadereffects/CurtainEffect.qml52
-rw-r--r--examples/declarative/shadereffects/qml/shadereffects/DropShadow.qml52
-rw-r--r--examples/declarative/shadereffects/qml/shadereffects/DropShadowEffect.qml52
-rw-r--r--examples/declarative/shadereffects/qml/shadereffects/Grayscale.qml52
-rw-r--r--examples/declarative/shadereffects/qml/shadereffects/GrayscaleEffect.qml56
-rw-r--r--examples/declarative/shadereffects/qml/shadereffects/ImageMask.qml52
-rw-r--r--examples/declarative/shadereffects/qml/shadereffects/ImageMaskEffect.qml56
-rw-r--r--examples/declarative/shadereffects/qml/shadereffects/RadialWave.qml52
-rw-r--r--examples/declarative/shadereffects/qml/shadereffects/RadialWaveEffect.qml52
-rw-r--r--examples/declarative/shadereffects/qml/shadereffects/Water.qml56
-rw-r--r--examples/declarative/shadereffects/qml/shadereffects/WaterEffect.qml52
-rw-r--r--examples/declarative/shadereffects/qml/shadereffects/main.qml52
-rw-r--r--examples/declarative/sqllocalstorage/main.cpp1
-rw-r--r--examples/declarative/sqllocalstorage/qml/sqllocalstorage/hello.qml1
-rw-r--r--examples/declarative/text/fonts/availableFonts/main.cpp3
-rw-r--r--examples/declarative/text/fonts/availableFonts/qml/availableFonts/availableFonts.qml1
-rw-r--r--examples/declarative/text/fonts/availableFonts/qml/availableFonts/banner.qml1
-rw-r--r--examples/declarative/text/fonts/availableFonts/qml/availableFonts/fonts.qml1
-rw-r--r--examples/declarative/text/fonts/availableFonts/qml/availableFonts/hello.qml1
-rw-r--r--examples/declarative/text/fonts/banner/main.cpp3
-rw-r--r--examples/declarative/text/fonts/banner/qml/banner/availableFonts.qml1
-rw-r--r--examples/declarative/text/fonts/banner/qml/banner/banner.qml1
-rw-r--r--examples/declarative/text/fonts/banner/qml/banner/fonts.qml1
-rw-r--r--examples/declarative/text/fonts/banner/qml/banner/hello.qml1
-rw-r--r--examples/declarative/text/fonts/fonts/main.cpp3
-rw-r--r--examples/declarative/text/fonts/fonts/qml/fonts-qml/availableFonts.qml1
-rw-r--r--examples/declarative/text/fonts/fonts/qml/fonts-qml/banner.qml1
-rw-r--r--examples/declarative/text/fonts/fonts/qml/fonts-qml/fonts.qml1
-rw-r--r--examples/declarative/text/fonts/fonts/qml/fonts-qml/hello.qml1
-rw-r--r--examples/declarative/text/fonts/hello/main.cpp3
-rw-r--r--examples/declarative/text/fonts/hello/qml/hello/availableFonts.qml1
-rw-r--r--examples/declarative/text/fonts/hello/qml/hello/banner.qml1
-rw-r--r--examples/declarative/text/fonts/hello/qml/hello/fonts.qml1
-rw-r--r--examples/declarative/text/fonts/hello/qml/hello/hello.qml1
-rw-r--r--examples/declarative/text/textselection/main.cpp3
-rw-r--r--examples/declarative/text/textselection/qml/textselection/textselection.qml52
-rw-r--r--examples/declarative/threading/threadedlistmodel/main.cpp1
-rw-r--r--examples/declarative/threading/threadedlistmodel/qml/threadedlistmodel/dataloader.js1
-rw-r--r--examples/declarative/threading/threadedlistmodel/qml/threadedlistmodel/timedisplay.qml1
-rw-r--r--examples/declarative/threading/threadedlistmodel/threadedlistmodel.qmlproject1
-rw-r--r--examples/declarative/threading/workerscript/main.cpp1
-rw-r--r--examples/declarative/threading/workerscript/qml/workerscript/workerscript.qml1
-rw-r--r--examples/declarative/touchinteraction/gestures/experimental-gestures/main.cpp3
-rw-r--r--examples/declarative/touchinteraction/gestures/experimental-gestures/qml/experimental-gestures/experimental-gestures.qml1
-rw-r--r--examples/declarative/touchinteraction/mousearea/mousearea-example/main.cpp3
-rw-r--r--examples/declarative/touchinteraction/mousearea/mousearea-example/qml/mousearea-example/mousearea-example.qml1
-rw-r--r--examples/declarative/touchinteraction/pincharea/main.cpp1
-rw-r--r--examples/declarative/touchinteraction/pincharea/qml/pincharea/flickresize.qml1
-rw-r--r--examples/declarative/toys/clocks/main.cpp3
-rw-r--r--examples/declarative/toys/clocks/qml/clocks/clocks.qml1
-rw-r--r--examples/declarative/toys/clocks/qml/clocks/content/Clock.qml1
-rw-r--r--examples/declarative/toys/clocks/qml/clocks/content/QuitButton.qml1
-rw-r--r--examples/declarative/toys/corkboards/main.cpp3
-rw-r--r--examples/declarative/toys/corkboards/qml/corkboards/Day.qml1
-rw-r--r--examples/declarative/toys/corkboards/qml/corkboards/corkboards.qml1
-rw-r--r--examples/declarative/toys/dynamicscene/main.cpp3
-rw-r--r--examples/declarative/toys/dynamicscene/qml/dynamicscene/Button.qml1
-rw-r--r--examples/declarative/toys/dynamicscene/qml/dynamicscene/GenericSceneItem.qml1
-rw-r--r--examples/declarative/toys/dynamicscene/qml/dynamicscene/PaletteItem.qml1
-rw-r--r--examples/declarative/toys/dynamicscene/qml/dynamicscene/PerspectiveItem.qml1
-rw-r--r--examples/declarative/toys/dynamicscene/qml/dynamicscene/Sun.qml1
-rw-r--r--examples/declarative/toys/dynamicscene/qml/dynamicscene/dynamicscene.qml1
-rw-r--r--examples/declarative/toys/tic-tac-toe/main.cpp3
-rw-r--r--examples/declarative/toys/tic-tac-toe/qml/tic-tac-toe/content/Button.qml1
-rw-r--r--examples/declarative/toys/tic-tac-toe/qml/tic-tac-toe/content/TicTac.qml1
-rw-r--r--examples/declarative/toys/tic-tac-toe/qml/tic-tac-toe/tic-tac-toe.qml1
-rw-r--r--examples/declarative/toys/tvtennis/main.cpp3
-rw-r--r--examples/declarative/toys/tvtennis/qml/tvtennis/tvtennis.qml1
-rw-r--r--examples/declarative/tutorials/extending/chapter1-basics/app.qml3
-rw-r--r--examples/declarative/tutorials/extending/chapter1-basics/main.cpp1
-rw-r--r--examples/declarative/tutorials/extending/chapter1-basics/piechart.cpp1
-rw-r--r--examples/declarative/tutorials/extending/chapter1-basics/piechart.h1
-rw-r--r--examples/declarative/tutorials/extending/chapter2-methods/app.qml3
-rw-r--r--examples/declarative/tutorials/extending/chapter2-methods/main.cpp1
-rw-r--r--examples/declarative/tutorials/extending/chapter2-methods/piechart.cpp1
-rw-r--r--examples/declarative/tutorials/extending/chapter2-methods/piechart.h1
-rw-r--r--examples/declarative/tutorials/extending/chapter3-bindings/app.qml3
-rw-r--r--examples/declarative/tutorials/extending/chapter3-bindings/main.cpp1
-rw-r--r--examples/declarative/tutorials/extending/chapter3-bindings/piechart.cpp1
-rw-r--r--examples/declarative/tutorials/extending/chapter3-bindings/piechart.h1
-rw-r--r--examples/declarative/tutorials/extending/chapter4-customPropertyTypes/app.qml3
-rw-r--r--examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp1
-rw-r--r--examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp1
-rw-r--r--examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.h1
-rw-r--r--examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp1
-rw-r--r--examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.h1
-rw-r--r--examples/declarative/tutorials/extending/chapter5-listproperties/app.qml3
-rw-r--r--examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp1
-rw-r--r--examples/declarative/tutorials/extending/chapter5-listproperties/piechart.cpp1
-rw-r--r--examples/declarative/tutorials/extending/chapter5-listproperties/piechart.h1
-rw-r--r--examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.cpp1
-rw-r--r--examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.h1
-rw-r--r--examples/declarative/tutorials/extending/chapter6-plugins/app.qml3
-rw-r--r--examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.cpp1
-rw-r--r--examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.h1
-rw-r--r--examples/declarative/tutorials/extending/chapter6-plugins/piechart.cpp1
-rw-r--r--examples/declarative/tutorials/extending/chapter6-plugins/piechart.h1
-rw-r--r--examples/declarative/tutorials/extending/chapter6-plugins/pieslice.cpp1
-rw-r--r--examples/declarative/tutorials/extending/chapter6-plugins/pieslice.h1
-rw-r--r--examples/declarative/tutorials/helloworld/Cell.qml3
-rw-r--r--examples/declarative/tutorials/helloworld/tutorial1.qml3
-rw-r--r--examples/declarative/tutorials/helloworld/tutorial2.qml3
-rw-r--r--examples/declarative/tutorials/helloworld/tutorial3.qml3
-rw-r--r--examples/declarative/tutorials/samegame/samegame1/Block.qml3
-rw-r--r--examples/declarative/tutorials/samegame/samegame1/Button.qml3
-rw-r--r--examples/declarative/tutorials/samegame/samegame1/samegame.qml3
-rw-r--r--examples/declarative/tutorials/samegame/samegame2/Block.qml3
-rw-r--r--examples/declarative/tutorials/samegame/samegame2/Button.qml3
-rw-r--r--examples/declarative/tutorials/samegame/samegame2/samegame.qml3
-rw-r--r--examples/declarative/tutorials/samegame/samegame3/Block.qml3
-rw-r--r--examples/declarative/tutorials/samegame/samegame3/Button.qml3
-rw-r--r--examples/declarative/tutorials/samegame/samegame3/Dialog.qml3
-rw-r--r--examples/declarative/tutorials/samegame/samegame3/samegame.qml3
-rw-r--r--examples/declarative/tutorials/samegame/samegame4/content/BoomBlock.qml3
-rw-r--r--examples/declarative/tutorials/samegame/samegame4/content/Button.qml3
-rw-r--r--examples/declarative/tutorials/samegame/samegame4/content/Dialog.qml3
-rw-r--r--examples/declarative/tutorials/samegame/samegame4/samegame.qml3
-rw-r--r--examples/declarative/ui-components/dialcontrol/main.cpp3
-rw-r--r--examples/declarative/ui-components/dialcontrol/qml/dialcontrol/content/Dial.qml1
-rw-r--r--examples/declarative/ui-components/dialcontrol/qml/dialcontrol/content/QuitButton.qml1
-rw-r--r--examples/declarative/ui-components/dialcontrol/qml/dialcontrol/dialcontrol.qml1
-rw-r--r--examples/declarative/ui-components/flipable/main.cpp3
-rw-r--r--examples/declarative/ui-components/flipable/qml/flipable/content/Card.qml1
-rw-r--r--examples/declarative/ui-components/flipable/qml/flipable/flipable.qml1
-rw-r--r--examples/declarative/ui-components/main/main.cpp3
-rw-r--r--examples/declarative/ui-components/main/qml/main/ScrollBar.qml1
-rw-r--r--examples/declarative/ui-components/main/qml/main/SearchBox.qml1
-rw-r--r--examples/declarative/ui-components/main/qml/main/TabWidget.qml1
-rw-r--r--examples/declarative/ui-components/main/qml/main/content/ProgressBar.qml1
-rw-r--r--examples/declarative/ui-components/main/qml/main/content/Spinner.qml1
-rw-r--r--examples/declarative/ui-components/main/qml/main/main.qml1
-rw-r--r--examples/declarative/ui-components/progressbar/main.cpp3
-rw-r--r--examples/declarative/ui-components/progressbar/qml/progressbar/content/ProgressBar.qml1
-rw-r--r--examples/declarative/ui-components/progressbar/qml/progressbar/main.qml1
-rw-r--r--examples/declarative/ui-components/scrollbar/main.cpp1
-rw-r--r--examples/declarative/ui-components/scrollbar/qml/scrollbar/ScrollBar.qml1
-rw-r--r--examples/declarative/ui-components/scrollbar/qml/scrollbar/main.qml1
-rw-r--r--examples/declarative/ui-components/searchbox/main.cpp1
-rw-r--r--examples/declarative/ui-components/searchbox/qml/searchbox/SearchBox.qml1
-rw-r--r--examples/declarative/ui-components/searchbox/qml/searchbox/main.qml1
-rw-r--r--examples/declarative/ui-components/slideswitch/main.cpp3
-rw-r--r--examples/declarative/ui-components/slideswitch/qml/slideswitch/content/Switch.qml1
-rw-r--r--examples/declarative/ui-components/slideswitch/qml/slideswitch/slideswitch.qml1
-rw-r--r--examples/declarative/ui-components/spinner/main.cpp1
-rw-r--r--examples/declarative/ui-components/spinner/qml/spinner/main.qml1
-rw-r--r--examples/declarative/ui-components/tabwidget/main.cpp1
-rw-r--r--examples/declarative/ui-components/tabwidget/qml/tabwidget/TabWidget.qml1
-rw-r--r--examples/declarative/ui-components/tabwidget/qml/tabwidget/main.qml1
-rw-r--r--examples/declarative/xml/xmlhttprequest-example/main.cpp3
-rw-r--r--examples/declarative/xml/xmlhttprequest-example/qml/xmlhttprequest-example/xmlhttprequest-example.qml1
-rw-r--r--examples/declarative/xml/xmlhttprequest/xmlhttprequest-example.qml1
-rw-r--r--examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp1
-rw-r--r--examples/helper/qmlapplicationviewer/qmlapplicationviewer.h1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/core/button.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/core/editMenu.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/core/fileDialog.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/core/fileMenu.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/core/menuBar.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/core/qmldir1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/core/textArea.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/filedialog/directory.cpp1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/filedialog/directory.h1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/filedialog/file.cpp1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/filedialog/file.h1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part0/Button.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part1/Button.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part1/EditMenu.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part1/FileMenu.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part1/SimpleButton.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part2/Button.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part2/EditMenu.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part2/FileMenu.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part2/MenuBar.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part3/Button.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part3/EditMenu.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part3/FileMenu.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part3/MenuBar.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part3/TextArea.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part3/TextEditor.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part4/Button.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part4/EditMenu.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part4/FileMenu.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part4/MenuBar.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part4/SimpleButton.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part4/TextArea.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part4/TextEditor.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part5/TextEditor.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part5/core/Button.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part5/core/EditMenu.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part5/core/FileDialog.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part5/core/FileMenu.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part5/core/MenuBar.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part5/core/TextArea.qml1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.cpp1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.h1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/directory.cpp1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/directory.h1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/file.cpp1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/file.h1
-rw-r--r--examples/tutorials/gettingStarted/gsQml/texteditor.qml1
-rw-r--r--src/declarative/debugger/qdeclarativedebug.h3
-rw-r--r--src/declarative/debugger/qdeclarativedebugclient.cpp3
-rw-r--r--src/declarative/debugger/qdeclarativedebugclient_p.h3
-rw-r--r--src/declarative/debugger/qdeclarativedebuggerstatus.cpp3
-rw-r--r--src/declarative/debugger/qdeclarativedebuggerstatus_p.h3
-rw-r--r--src/declarative/debugger/qdeclarativedebughelper.cpp3
-rw-r--r--src/declarative/debugger/qdeclarativedebughelper_p.h3
-rw-r--r--src/declarative/debugger/qdeclarativedebugserver.cpp3
-rw-r--r--src/declarative/debugger/qdeclarativedebugserver_p.h3
-rw-r--r--src/declarative/debugger/qdeclarativedebugserverconnection_p.h3
-rw-r--r--src/declarative/debugger/qdeclarativedebugservice.cpp3
-rw-r--r--src/declarative/debugger/qdeclarativedebugservice_p.h3
-rw-r--r--src/declarative/debugger/qdeclarativedebugservice_p_p.h3
-rw-r--r--src/declarative/debugger/qdeclarativedebugtrace.cpp3
-rw-r--r--src/declarative/debugger/qdeclarativedebugtrace_p.h3
-rw-r--r--src/declarative/debugger/qdeclarativeenginedebug.cpp3
-rw-r--r--src/declarative/debugger/qdeclarativeenginedebug_p.h3
-rw-r--r--src/declarative/debugger/qdeclarativeenginedebugservice.cpp3
-rw-r--r--src/declarative/debugger/qdeclarativeenginedebugservice_p.h3
-rw-r--r--src/declarative/debugger/qdeclarativeinspectorinterface_p.h3
-rw-r--r--src/declarative/debugger/qdeclarativeinspectorservice.cpp3
-rw-r--r--src/declarative/debugger/qdeclarativeinspectorservice_p.h3
-rw-r--r--src/declarative/debugger/qjsdebuggeragent.cpp3
-rw-r--r--src/declarative/debugger/qjsdebuggeragent_p.h3
-rw-r--r--src/declarative/debugger/qjsdebugservice.cpp3
-rw-r--r--src/declarative/debugger/qjsdebugservice_p.h3
-rw-r--r--src/declarative/debugger/qpacketprotocol.cpp3
-rw-r--r--src/declarative/debugger/qpacketprotocol_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeanchors.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeanchors_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeanchors_p_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeborderimage.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeborderimage_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeborderimage_p_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeevents.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeevents_p_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeflickable.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeflickable_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeflickable_p_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeflipable.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeflipable_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativefocuspanel.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativefocuspanel_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativefocusscope.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativefocusscope_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativegraphicswidget.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativegraphicswidget_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativegridview.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativegridview_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeimage.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeimage_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeimage_p_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeimagebase.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeimagebase_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeimplicitsizeitem.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeimplicitsizeitem_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeimplicitsizeitem_p_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeitem.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeitem.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeitem_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeitemchangelistener_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeitemsmodule_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativelayoutitem.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativelayoutitem_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativelistview.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativelistview_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeloader.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeloader_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativeloader_p_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativemousearea.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativemousearea_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativemousearea_p_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativepainteditem.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativepainteditem_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativepainteditem_p_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativepath.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativepath_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativepath_p_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativepathview.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativepathview_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativepathview_p_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativepincharea.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativepincharea_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativepincharea_p_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativepositioners.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativepositioners_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativepositioners_p_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativerectangle.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativerectangle_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativerectangle_p_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativerepeater.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativerepeater_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativerepeater_p_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativescalegrid.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativetext.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativetext_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativetext_p_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextedit.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextedit_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextedit_p_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextinput.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextinput_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextinput_p_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextlayout.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextlayout_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativetranslate.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativetranslate_p.h3
-rw-r--r--src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h3
-rw-r--r--src/declarative/qml/parser/qdeclarativejs.g5
-rw-r--r--src/declarative/qml/parser/qdeclarativejsast.cpp3
-rw-r--r--src/declarative/qml/parser/qdeclarativejsast_p.h3
-rw-r--r--src/declarative/qml/parser/qdeclarativejsastfwd_p.h3
-rw-r--r--src/declarative/qml/parser/qdeclarativejsastvisitor.cpp3
-rw-r--r--src/declarative/qml/parser/qdeclarativejsastvisitor_p.h3
-rw-r--r--src/declarative/qml/parser/qdeclarativejsengine_p.cpp3
-rw-r--r--src/declarative/qml/parser/qdeclarativejsengine_p.h3
-rw-r--r--src/declarative/qml/parser/qdeclarativejsglobal_p.h3
-rw-r--r--src/declarative/qml/parser/qdeclarativejsgrammar.cpp3
-rw-r--r--src/declarative/qml/parser/qdeclarativejsgrammar_p.h3
-rw-r--r--src/declarative/qml/parser/qdeclarativejslexer.cpp3
-rw-r--r--src/declarative/qml/parser/qdeclarativejslexer_p.h3
-rw-r--r--src/declarative/qml/parser/qdeclarativejsmemorypool_p.h3
-rw-r--r--src/declarative/qml/parser/qdeclarativejsnodepool_p.h3
-rw-r--r--src/declarative/qml/parser/qdeclarativejsparser.cpp3
-rw-r--r--src/declarative/qml/parser/qdeclarativejsparser_p.h3
-rw-r--r--src/declarative/qml/qbitfield_p.h3
-rw-r--r--src/declarative/qml/qdeclarative.h3
-rw-r--r--src/declarative/qml/qdeclarativebinding.cpp3
-rw-r--r--src/declarative/qml/qdeclarativebinding_p.h3
-rw-r--r--src/declarative/qml/qdeclarativebinding_p_p.h3
-rw-r--r--src/declarative/qml/qdeclarativeboundsignal.cpp3
-rw-r--r--src/declarative/qml/qdeclarativeboundsignal_p.h3
-rw-r--r--src/declarative/qml/qdeclarativecleanup.cpp3
-rw-r--r--src/declarative/qml/qdeclarativecleanup_p.h3
-rw-r--r--src/declarative/qml/qdeclarativecompiledbindings.cpp3
-rw-r--r--src/declarative/qml/qdeclarativecompiledbindings_p.h3
-rw-r--r--src/declarative/qml/qdeclarativecompileddata.cpp3
-rw-r--r--src/declarative/qml/qdeclarativecompiler.cpp3
-rw-r--r--src/declarative/qml/qdeclarativecompiler_p.h3
-rw-r--r--src/declarative/qml/qdeclarativecomponent.cpp3
-rw-r--r--src/declarative/qml/qdeclarativecomponent.h3
-rw-r--r--src/declarative/qml/qdeclarativecomponent_p.h3
-rw-r--r--src/declarative/qml/qdeclarativecontext.cpp3
-rw-r--r--src/declarative/qml/qdeclarativecontext.h3
-rw-r--r--src/declarative/qml/qdeclarativecontext_p.h3
-rw-r--r--src/declarative/qml/qdeclarativecontextscriptclass.cpp3
-rw-r--r--src/declarative/qml/qdeclarativecontextscriptclass_p.h3
-rw-r--r--src/declarative/qml/qdeclarativecustomparser.cpp3
-rw-r--r--src/declarative/qml/qdeclarativecustomparser_p.h3
-rw-r--r--src/declarative/qml/qdeclarativecustomparser_p_p.h3
-rw-r--r--src/declarative/qml/qdeclarativedata_p.h3
-rw-r--r--src/declarative/qml/qdeclarativedirparser.cpp3
-rw-r--r--src/declarative/qml/qdeclarativedirparser_p.h3
-rw-r--r--src/declarative/qml/qdeclarativedom.cpp3
-rw-r--r--src/declarative/qml/qdeclarativedom_p.h3
-rw-r--r--src/declarative/qml/qdeclarativedom_p_p.h3
-rw-r--r--src/declarative/qml/qdeclarativeengine.cpp3
-rw-r--r--src/declarative/qml/qdeclarativeengine.h3
-rw-r--r--src/declarative/qml/qdeclarativeengine_p.h3
-rw-r--r--src/declarative/qml/qdeclarativeerror.cpp3
-rw-r--r--src/declarative/qml/qdeclarativeerror.h3
-rw-r--r--src/declarative/qml/qdeclarativeexpression.cpp3
-rw-r--r--src/declarative/qml/qdeclarativeexpression.h3
-rw-r--r--src/declarative/qml/qdeclarativeexpression_p.h3
-rw-r--r--src/declarative/qml/qdeclarativeextensioninterface.h3
-rw-r--r--src/declarative/qml/qdeclarativeextensionplugin.cpp3
-rw-r--r--src/declarative/qml/qdeclarativeextensionplugin.h3
-rw-r--r--src/declarative/qml/qdeclarativefastproperties.cpp3
-rw-r--r--src/declarative/qml/qdeclarativefastproperties_p.h3
-rw-r--r--src/declarative/qml/qdeclarativeglobal_p.h3
-rw-r--r--src/declarative/qml/qdeclarativeglobalscriptclass.cpp3
-rw-r--r--src/declarative/qml/qdeclarativeglobalscriptclass_p.h3
-rw-r--r--src/declarative/qml/qdeclarativeguard_p.h3
-rw-r--r--src/declarative/qml/qdeclarativeimageprovider.cpp3
-rw-r--r--src/declarative/qml/qdeclarativeimageprovider.h3
-rw-r--r--src/declarative/qml/qdeclarativeimport.cpp3
-rw-r--r--src/declarative/qml/qdeclarativeimport_p.h3
-rw-r--r--src/declarative/qml/qdeclarativeinclude.cpp3
-rw-r--r--src/declarative/qml/qdeclarativeinclude_p.h3
-rw-r--r--src/declarative/qml/qdeclarativeinfo.cpp3
-rw-r--r--src/declarative/qml/qdeclarativeinfo.h3
-rw-r--r--src/declarative/qml/qdeclarativeinstruction.cpp3
-rw-r--r--src/declarative/qml/qdeclarativeinstruction_p.h3
-rw-r--r--src/declarative/qml/qdeclarativeintegercache.cpp3
-rw-r--r--src/declarative/qml/qdeclarativeintegercache_p.h3
-rw-r--r--src/declarative/qml/qdeclarativelist.cpp3
-rw-r--r--src/declarative/qml/qdeclarativelist.h3
-rw-r--r--src/declarative/qml/qdeclarativelist_p.h3
-rw-r--r--src/declarative/qml/qdeclarativelistscriptclass.cpp3
-rw-r--r--src/declarative/qml/qdeclarativelistscriptclass_p.h3
-rw-r--r--src/declarative/qml/qdeclarativemetatype.cpp3
-rw-r--r--src/declarative/qml/qdeclarativemetatype_p.h3
-rw-r--r--src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.cpp3
-rw-r--r--src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h3
-rw-r--r--src/declarative/qml/qdeclarativenotifier.cpp3
-rw-r--r--src/declarative/qml/qdeclarativenotifier_p.h3
-rw-r--r--src/declarative/qml/qdeclarativeobjectscriptclass.cpp3
-rw-r--r--src/declarative/qml/qdeclarativeobjectscriptclass_p.h3
-rw-r--r--src/declarative/qml/qdeclarativeparser.cpp3
-rw-r--r--src/declarative/qml/qdeclarativeparser_p.h3
-rw-r--r--src/declarative/qml/qdeclarativeparserstatus.cpp3
-rw-r--r--src/declarative/qml/qdeclarativeparserstatus.h3
-rw-r--r--src/declarative/qml/qdeclarativeprivate.h3
-rw-r--r--src/declarative/qml/qdeclarativeproperty.cpp3
-rw-r--r--src/declarative/qml/qdeclarativeproperty.h3
-rw-r--r--src/declarative/qml/qdeclarativeproperty_p.h3
-rw-r--r--src/declarative/qml/qdeclarativepropertycache.cpp3
-rw-r--r--src/declarative/qml/qdeclarativepropertycache_p.h3
-rw-r--r--src/declarative/qml/qdeclarativepropertyvalueinterceptor.cpp3
-rw-r--r--src/declarative/qml/qdeclarativepropertyvalueinterceptor.h3
-rw-r--r--src/declarative/qml/qdeclarativepropertyvaluesource.cpp3
-rw-r--r--src/declarative/qml/qdeclarativepropertyvaluesource.h3
-rw-r--r--src/declarative/qml/qdeclarativeproxymetaobject.cpp3
-rw-r--r--src/declarative/qml/qdeclarativeproxymetaobject_p.h3
-rw-r--r--src/declarative/qml/qdeclarativerefcount.cpp3
-rw-r--r--src/declarative/qml/qdeclarativerefcount_p.h3
-rw-r--r--src/declarative/qml/qdeclarativerewrite.cpp3
-rw-r--r--src/declarative/qml/qdeclarativerewrite_p.h3
-rw-r--r--src/declarative/qml/qdeclarativescriptparser.cpp3
-rw-r--r--src/declarative/qml/qdeclarativescriptparser_p.h3
-rw-r--r--src/declarative/qml/qdeclarativescriptstring.cpp3
-rw-r--r--src/declarative/qml/qdeclarativescriptstring.h3
-rw-r--r--src/declarative/qml/qdeclarativesqldatabase.cpp3
-rw-r--r--src/declarative/qml/qdeclarativesqldatabase_p.h3
-rw-r--r--src/declarative/qml/qdeclarativestringconverters.cpp3
-rw-r--r--src/declarative/qml/qdeclarativestringconverters_p.h3
-rw-r--r--src/declarative/qml/qdeclarativetypeloader.cpp3
-rw-r--r--src/declarative/qml/qdeclarativetypeloader_p.h3
-rw-r--r--src/declarative/qml/qdeclarativetypenamecache.cpp3
-rw-r--r--src/declarative/qml/qdeclarativetypenamecache_p.h3
-rw-r--r--src/declarative/qml/qdeclarativetypenamescriptclass.cpp3
-rw-r--r--src/declarative/qml/qdeclarativetypenamescriptclass_p.h3
-rw-r--r--src/declarative/qml/qdeclarativetypenotavailable.cpp3
-rw-r--r--src/declarative/qml/qdeclarativetypenotavailable_p.h3
-rw-r--r--src/declarative/qml/qdeclarativevaluetype.cpp3
-rw-r--r--src/declarative/qml/qdeclarativevaluetype_p.h3
-rw-r--r--src/declarative/qml/qdeclarativevaluetypescriptclass.cpp3
-rw-r--r--src/declarative/qml/qdeclarativevaluetypescriptclass_p.h3
-rw-r--r--src/declarative/qml/qdeclarativevme.cpp3
-rw-r--r--src/declarative/qml/qdeclarativevme_p.h3
-rw-r--r--src/declarative/qml/qdeclarativevmemetaobject.cpp3
-rw-r--r--src/declarative/qml/qdeclarativevmemetaobject_p.h3
-rw-r--r--src/declarative/qml/qdeclarativewatcher.cpp3
-rw-r--r--src/declarative/qml/qdeclarativewatcher_p.h3
-rw-r--r--src/declarative/qml/qdeclarativeworkerscript.cpp3
-rw-r--r--src/declarative/qml/qdeclarativeworkerscript_p.h3
-rw-r--r--src/declarative/qml/qdeclarativexmlhttprequest.cpp3
-rw-r--r--src/declarative/qml/qdeclarativexmlhttprequest_p.h3
-rw-r--r--src/declarative/qml/qperformancetimer.cpp3
-rw-r--r--src/declarative/qml/qperformancetimer_p.h3
-rw-r--r--src/declarative/qml/qpodvector_p.h3
-rw-r--r--src/declarative/qml/rewriter/textwriter.cpp3
-rw-r--r--src/declarative/qml/rewriter/textwriter_p.h3
-rw-r--r--src/declarative/util/qdeclarativeanimation.cpp3
-rw-r--r--src/declarative/util/qdeclarativeanimation_p.h3
-rw-r--r--src/declarative/util/qdeclarativeanimation_p_p.h3
-rw-r--r--src/declarative/util/qdeclarativeapplication.cpp3
-rw-r--r--src/declarative/util/qdeclarativeapplication_p.h3
-rw-r--r--src/declarative/util/qdeclarativebehavior.cpp3
-rw-r--r--src/declarative/util/qdeclarativebehavior_p.h3
-rw-r--r--src/declarative/util/qdeclarativebind.cpp3
-rw-r--r--src/declarative/util/qdeclarativebind_p.h3
-rw-r--r--src/declarative/util/qdeclarativeconnections.cpp3
-rw-r--r--src/declarative/util/qdeclarativeconnections_p.h3
-rw-r--r--src/declarative/util/qdeclarativefontloader.cpp3
-rw-r--r--src/declarative/util/qdeclarativefontloader_p.h3
-rw-r--r--src/declarative/util/qdeclarativelistaccessor.cpp3
-rw-r--r--src/declarative/util/qdeclarativelistaccessor_p.h3
-rw-r--r--src/declarative/util/qdeclarativelistmodel.cpp3
-rw-r--r--src/declarative/util/qdeclarativelistmodel_p.h3
-rw-r--r--src/declarative/util/qdeclarativelistmodel_p_p.h3
-rw-r--r--src/declarative/util/qdeclarativelistmodelworkeragent.cpp3
-rw-r--r--src/declarative/util/qdeclarativelistmodelworkeragent_p.h3
-rw-r--r--src/declarative/util/qdeclarativenullablevalue_p_p.h3
-rw-r--r--src/declarative/util/qdeclarativeopenmetaobject.cpp3
-rw-r--r--src/declarative/util/qdeclarativeopenmetaobject_p.h3
-rw-r--r--src/declarative/util/qdeclarativepackage.cpp3
-rw-r--r--src/declarative/util/qdeclarativepackage_p.h3
-rw-r--r--src/declarative/util/qdeclarativepixmapcache.cpp3
-rw-r--r--src/declarative/util/qdeclarativepixmapcache_p.h3
-rw-r--r--src/declarative/util/qdeclarativepropertychanges.cpp3
-rw-r--r--src/declarative/util/qdeclarativepropertychanges_p.h3
-rw-r--r--src/declarative/util/qdeclarativepropertymap.cpp3
-rw-r--r--src/declarative/util/qdeclarativepropertymap.h3
-rw-r--r--src/declarative/util/qdeclarativesmoothedanimation.cpp3
-rw-r--r--src/declarative/util/qdeclarativesmoothedanimation_p.h3
-rw-r--r--src/declarative/util/qdeclarativesmoothedanimation_p_p.h3
-rw-r--r--src/declarative/util/qdeclarativespringanimation.cpp3
-rw-r--r--src/declarative/util/qdeclarativespringanimation_p.h3
-rw-r--r--src/declarative/util/qdeclarativestate.cpp3
-rw-r--r--src/declarative/util/qdeclarativestate_p.h3
-rw-r--r--src/declarative/util/qdeclarativestate_p_p.h3
-rw-r--r--src/declarative/util/qdeclarativestategroup.cpp3
-rw-r--r--src/declarative/util/qdeclarativestategroup_p.h3
-rw-r--r--src/declarative/util/qdeclarativestateoperations.cpp3
-rw-r--r--src/declarative/util/qdeclarativestateoperations_p.h3
-rw-r--r--src/declarative/util/qdeclarativestyledtext.cpp3
-rw-r--r--src/declarative/util/qdeclarativestyledtext_p.h3
-rw-r--r--src/declarative/util/qdeclarativesystempalette.cpp3
-rw-r--r--src/declarative/util/qdeclarativesystempalette_p.h3
-rw-r--r--src/declarative/util/qdeclarativetimeline.cpp3
-rw-r--r--src/declarative/util/qdeclarativetimeline_p_p.h3
-rw-r--r--src/declarative/util/qdeclarativetimer.cpp3
-rw-r--r--src/declarative/util/qdeclarativetimer_p.h3
-rw-r--r--src/declarative/util/qdeclarativetransition.cpp3
-rw-r--r--src/declarative/util/qdeclarativetransition_p.h3
-rw-r--r--src/declarative/util/qdeclarativetransitionmanager.cpp3
-rw-r--r--src/declarative/util/qdeclarativetransitionmanager_p_p.h3
-rw-r--r--src/declarative/util/qdeclarativeutilmodule.cpp3
-rw-r--r--src/declarative/util/qdeclarativeutilmodule_p.h3
-rw-r--r--src/declarative/util/qdeclarativeview.cpp3
-rw-r--r--src/declarative/util/qdeclarativeview.h3
-rw-r--r--src/declarative/util/qdeclarativexmllistmodel.cpp3
-rw-r--r--src/declarative/util/qdeclarativexmllistmodel_p.h3
-rw-r--r--src/declarative/util/qlistmodelinterface.cpp3
-rw-r--r--src/declarative/util/qlistmodelinterface_p.h3
-rw-r--r--src/imports/folderlistmodel/plugin.cpp1
-rw-r--r--src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp1
-rw-r--r--src/imports/folderlistmodel/qdeclarativefolderlistmodel.h1
-rw-r--r--src/imports/gestures/plugin.cpp1
-rw-r--r--src/imports/gestures/qdeclarativegesturearea.cpp1
-rw-r--r--src/imports/gestures/qdeclarativegesturearea_p.h1
-rw-r--r--src/imports/particles/particles.cpp1
-rw-r--r--src/imports/particles/qdeclarativeparticles.cpp1
-rw-r--r--src/imports/particles/qdeclarativeparticles_p.h1
-rw-r--r--src/imports/shaders/glfunctions.h1
-rw-r--r--src/imports/shaders/qmlshadersplugin_plugin.cpp1
-rw-r--r--src/imports/shaders/qmlshadersplugin_plugin.h1
-rw-r--r--src/imports/shaders/scenegraph/qsggeometry.cpp1
-rw-r--r--src/imports/shaders/scenegraph/qsggeometry.h1
-rw-r--r--src/imports/shaders/shadereffect.cpp1
-rw-r--r--src/imports/shaders/shadereffect.h1
-rw-r--r--src/imports/shaders/shadereffectbuffer.cpp1
-rw-r--r--src/imports/shaders/shadereffectbuffer.h1
-rw-r--r--src/imports/shaders/shadereffectitem.cpp1
-rw-r--r--src/imports/shaders/shadereffectitem.h1
-rw-r--r--src/imports/shaders/shadereffectsource.cpp1
-rw-r--r--src/imports/shaders/shadereffectsource.h1
-rw-r--r--src/plugins/platforms/uikit/examples/qmltest/main.mm1
-rw-r--r--src/plugins/platforms/uikit/examples/qmltest/qml/main.qml1
-rw-r--r--src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/moc_qmlapplicationviewer.cpp1
-rw-r--r--src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.cpp1
-rw-r--r--src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.h1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/abstracttool.cpp1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/abstracttool.h1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.h1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/editor/abstractliveedittool.cpp1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/editor/abstractliveedittool.h1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/editor/boundingrecthighlighter.cpp1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/editor/boundingrecthighlighter.h1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.h1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/editor/livelayeritem.cpp1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/editor/livelayeritem.h1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/editor/liverubberbandselectionmanipulator.cpp1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/editor/liverubberbandselectionmanipulator.h1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionindicator.cpp1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionindicator.h1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionrectangle.cpp1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionrectangle.h1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.h1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/editor/livesingleselectionmanipulator.cpp1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/editor/livesingleselectionmanipulator.h1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/editor/subcomponentmasklayeritem.cpp1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/editor/subcomponentmasklayeritem.h1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.h1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorprotocol.h1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.h1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector_p.h1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/qmlinspectorconstants.h1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.cpp1
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.h1
-rw-r--r--src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp1
-rw-r--r--src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h1
-rw-r--r--tests/auto/declarative/examples/tst_examples.cpp1
-rw-r--r--tests/auto/declarative/moduleqt47/tst_moduleqt47.cpp1
-rw-r--r--tests/auto/declarative/parserstress/tst_parserstress.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h3
-rw-r--r--tests/auto/declarative/qdeclarativedebughelper/tst_qdeclarativedebughelper.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativedebugjs/app/main.cpp3
-rw-r--r--tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/testtypes.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/testtypes.h1
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/testtypes.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/testtypes.h1
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativelistview/incrementalmodel.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativelistview/incrementalmodel.h1
-rw-r--r--tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/plugin.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/plugin.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/plugin.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativevaluetypes/testtypes.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativevaluetypes/testtypes.h1
-rw-r--r--tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp1
-rw-r--r--tests/auto/declarative/qmlshadersplugin/main.qml3
-rw-r--r--tests/auto/declarative/qmlshadersplugin/tst_qmlshadersplugin.cpp3
-rw-r--r--tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp1
-rw-r--r--tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp1
-rw-r--r--tests/auto/declarative/qperformancetimer/tst_qperformancetimer.cpp1
-rwxr-xr-xtests/auto/declarative/runall.sh1
-rw-r--r--tests/auto/declarative/shared/debugutil.cpp1
-rw-r--r--tests/auto/declarative/shared/debugutil_p.h1
-rw-r--r--tests/auto/declarative/shared/platforminputcontext.h1
-rw-r--r--tests/auto/declarative/shared/testhttpserver.cpp1
-rw-r--r--tests/auto/declarative/shared/testhttpserver.h1
-rw-r--r--tests/manual/declarative/qmlshadersplugin/main.cpp3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestActive.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestBasic.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestBlending.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestBlendingModes.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestEffectHierarchy.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestEffectInsideAnotherEffect.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestFormat.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestFragmentShader.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestGrab.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestHideOriginal.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestHorizontalWrap.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestImageFiltering.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestImageMargins.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestImageMarginsWithTextureSize.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestImageMipmap.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestItemMargins.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestItemMarginsWithTextureSize.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestLive.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestMeshResolution.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestOneSource.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestOpacity.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestRotation.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestScale.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestTextureSize.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestTwiceOnSameSource.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestTwoSources.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVerticalWrap.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestWrapRepeat.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/main.qml3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.cpp3
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.h3
-rw-r--r--tests/system/declarative/sys_calculator/sys_calculator.qtt1
-rw-r--r--tests/system/declarative/sys_dial/sys_dial.qtt1
-rw-r--r--tests/system/declarative/sys_flickr/sys_flickr.qtt1
-rw-r--r--tests/system/declarative/sys_parallax/sys_parallax.qtt1
-rw-r--r--tests/system/declarative/sys_pincharea/sys_pincharea.qtt1
-rw-r--r--tests/system/declarative/sys_rtl/sys_rtl.qtt1
-rw-r--r--tests/system/declarative/sys_samegame/sys_samegame.qtt1
-rw-r--r--tests/system/declarative/sys_textedit/sys_textedit.qtt1
-rw-r--r--tests/system/declarative/sys_textinput/sys_textinput.qtt1
-rw-r--r--tests/system/declarative/sys_twitter/sys_twitter.qtt1
-rw-r--r--tests/system/declarative/sys_webbrowser/sys_webbrowser.qtt1
-rw-r--r--tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp1
-rw-r--r--tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h1
-rw-r--r--tools/qml/browser/Browser.qml1
-rw-r--r--tools/qml/deviceorientation.cpp1
-rw-r--r--tools/qml/deviceorientation.h1
-rw-r--r--tools/qml/deviceorientation_harmattan.cpp1
-rw-r--r--tools/qml/deviceorientation_maemo5.cpp1
-rw-r--r--tools/qml/deviceorientation_symbian.cpp1
-rw-r--r--tools/qml/loggerwidget.cpp1
-rw-r--r--tools/qml/loggerwidget.h1
-rw-r--r--tools/qml/main.cpp1
-rw-r--r--tools/qml/proxysettings.cpp1
-rw-r--r--tools/qml/proxysettings.h1
-rw-r--r--tools/qml/qdeclarativetester.cpp1
-rw-r--r--tools/qml/qdeclarativetester.h1
-rw-r--r--tools/qml/qmlruntime.cpp1
-rw-r--r--tools/qml/qmlruntime.h1
-rw-r--r--tools/qml/startup/Logo.qml1
-rw-r--r--tools/qml/startup/startup.qml1
-rw-r--r--tools/qml/texteditautoresizer_maemo5.h1
1361 files changed, 4418 insertions, 3007 deletions
diff --git a/demos/declarative/calculator/main.cpp b/demos/declarative/calculator/main.cpp
index 1ba16cae..90c2fc4b 100644
--- a/demos/declarative/calculator/main.cpp
+++ b/demos/declarative/calculator/main.cpp
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/calculator/qml/calculator/CalculatorCore/Button.qml b/demos/declarative/calculator/qml/calculator/CalculatorCore/Button.qml
index 270a3da1..15fa9865 100644
--- a/demos/declarative/calculator/qml/calculator/CalculatorCore/Button.qml
+++ b/demos/declarative/calculator/qml/calculator/CalculatorCore/Button.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/calculator/qml/calculator/CalculatorCore/Display.qml b/demos/declarative/calculator/qml/calculator/CalculatorCore/Display.qml
index 351c638b..79a64bd9 100644
--- a/demos/declarative/calculator/qml/calculator/CalculatorCore/Display.qml
+++ b/demos/declarative/calculator/qml/calculator/CalculatorCore/Display.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/calculator/qml/calculator/calculator.qml b/demos/declarative/calculator/qml/calculator/calculator.qml
index c5072991..686f74be 100644
--- a/demos/declarative/calculator/qml/calculator/calculator.qml
+++ b/demos/declarative/calculator/qml/calculator/calculator.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/flickr/main.cpp b/demos/declarative/flickr/main.cpp
index 5cc4e047..cd3c09b4 100644
--- a/demos/declarative/flickr/main.cpp
+++ b/demos/declarative/flickr/main.cpp
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/flickr/qml/flickr/common/Progress.qml b/demos/declarative/flickr/qml/flickr/common/Progress.qml
index 385b9716..9d75756f 100644
--- a/demos/declarative/flickr/qml/flickr/common/Progress.qml
+++ b/demos/declarative/flickr/qml/flickr/common/Progress.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/flickr/qml/flickr/common/RssModel.qml b/demos/declarative/flickr/qml/flickr/common/RssModel.qml
index 5d9a45c6..03ea9f3a 100644
--- a/demos/declarative/flickr/qml/flickr/common/RssModel.qml
+++ b/demos/declarative/flickr/qml/flickr/common/RssModel.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/flickr/qml/flickr/common/ScrollBar.qml b/demos/declarative/flickr/qml/flickr/common/ScrollBar.qml
index 28d97541..9ed2457a 100644
--- a/demos/declarative/flickr/qml/flickr/common/ScrollBar.qml
+++ b/demos/declarative/flickr/qml/flickr/common/ScrollBar.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/flickr/qml/flickr/common/Slider.qml b/demos/declarative/flickr/qml/flickr/common/Slider.qml
index c2d69bf3..d16a5d65 100644
--- a/demos/declarative/flickr/qml/flickr/common/Slider.qml
+++ b/demos/declarative/flickr/qml/flickr/common/Slider.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/flickr/qml/flickr/flickr-90.qml b/demos/declarative/flickr/qml/flickr/flickr-90.qml
index 14d786cf..f99b5ca9 100644
--- a/demos/declarative/flickr/qml/flickr/flickr-90.qml
+++ b/demos/declarative/flickr/qml/flickr/flickr-90.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/flickr/qml/flickr/flickr.qml b/demos/declarative/flickr/qml/flickr/flickr.qml
index 0cf92d3d..33eb1e63 100644
--- a/demos/declarative/flickr/qml/flickr/flickr.qml
+++ b/demos/declarative/flickr/qml/flickr/flickr.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/flickr/qml/flickr/mobile/Button.qml b/demos/declarative/flickr/qml/flickr/mobile/Button.qml
index e2031823..13d08024 100644
--- a/demos/declarative/flickr/qml/flickr/mobile/Button.qml
+++ b/demos/declarative/flickr/qml/flickr/mobile/Button.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/flickr/qml/flickr/mobile/GridDelegate.qml b/demos/declarative/flickr/qml/flickr/mobile/GridDelegate.qml
index cd0d51d5..91f916f6 100644
--- a/demos/declarative/flickr/qml/flickr/mobile/GridDelegate.qml
+++ b/demos/declarative/flickr/qml/flickr/mobile/GridDelegate.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/flickr/qml/flickr/mobile/ImageDetails.qml b/demos/declarative/flickr/qml/flickr/mobile/ImageDetails.qml
index ef966002..8f25e500 100644
--- a/demos/declarative/flickr/qml/flickr/mobile/ImageDetails.qml
+++ b/demos/declarative/flickr/qml/flickr/mobile/ImageDetails.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/flickr/qml/flickr/mobile/ListDelegate.qml b/demos/declarative/flickr/qml/flickr/mobile/ListDelegate.qml
index 7a54443d..7fa192fb 100644
--- a/demos/declarative/flickr/qml/flickr/mobile/ListDelegate.qml
+++ b/demos/declarative/flickr/qml/flickr/mobile/ListDelegate.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/flickr/qml/flickr/mobile/TitleBar.qml b/demos/declarative/flickr/qml/flickr/mobile/TitleBar.qml
index f0d0703c..6f02ad0e 100644
--- a/demos/declarative/flickr/qml/flickr/mobile/TitleBar.qml
+++ b/demos/declarative/flickr/qml/flickr/mobile/TitleBar.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/flickr/qml/flickr/mobile/ToolBar.qml b/demos/declarative/flickr/qml/flickr/mobile/ToolBar.qml
index 7a8ec14c..ab675d3d 100644
--- a/demos/declarative/flickr/qml/flickr/mobile/ToolBar.qml
+++ b/demos/declarative/flickr/qml/flickr/mobile/ToolBar.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/minehunt/main.cpp b/demos/declarative/minehunt/main.cpp
index 2089703d..d2dcc00f 100644
--- a/demos/declarative/minehunt/main.cpp
+++ b/demos/declarative/minehunt/main.cpp
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/minehunt/minehunt.cpp b/demos/declarative/minehunt/minehunt.cpp
index 21f9b320..9d640ced 100644
--- a/demos/declarative/minehunt/minehunt.cpp
+++ b/demos/declarative/minehunt/minehunt.cpp
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/minehunt/minehunt.h b/demos/declarative/minehunt/minehunt.h
index 5d6902ec..39d09ff5 100644
--- a/demos/declarative/minehunt/minehunt.h
+++ b/demos/declarative/minehunt/minehunt.h
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/Explosion.qml b/demos/declarative/minehunt/qml/minehunt/MinehuntCore/Explosion.qml
index 41f0cc30..9071007d 100644
--- a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/Explosion.qml
+++ b/demos/declarative/minehunt/qml/minehunt/MinehuntCore/Explosion.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/Tile.qml b/demos/declarative/minehunt/qml/minehunt/MinehuntCore/Tile.qml
index 99f3ce05..97800d5a 100644
--- a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/Tile.qml
+++ b/demos/declarative/minehunt/qml/minehunt/MinehuntCore/Tile.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/minehunt/qml/minehunt/minehunt.qml b/demos/declarative/minehunt/qml/minehunt/minehunt.qml
index 51b4d90e..773e1fa5 100644
--- a/demos/declarative/minehunt/qml/minehunt/minehunt.qml
+++ b/demos/declarative/minehunt/qml/minehunt/minehunt.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/photoviewer/main.cpp b/demos/declarative/photoviewer/main.cpp
index 9632fe72..c2c4cbfe 100644
--- a/demos/declarative/photoviewer/main.cpp
+++ b/demos/declarative/photoviewer/main.cpp
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/AlbumDelegate.qml b/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/AlbumDelegate.qml
index b64da40b..595f6589 100644
--- a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/AlbumDelegate.qml
+++ b/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/AlbumDelegate.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/BusyIndicator.qml b/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/BusyIndicator.qml
index bd0391e6..e57156ac 100644
--- a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/BusyIndicator.qml
+++ b/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/BusyIndicator.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/Button.qml b/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/Button.qml
index a4b4e96f..ec2d16ad 100644
--- a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/Button.qml
+++ b/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/Button.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/EditableButton.qml b/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/EditableButton.qml
index fd1cf358..86b785bc 100644
--- a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/EditableButton.qml
+++ b/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/EditableButton.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/PhotoDelegate.qml b/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/PhotoDelegate.qml
index 118d468c..d2970e6f 100644
--- a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/PhotoDelegate.qml
+++ b/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/PhotoDelegate.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/ProgressBar.qml b/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/ProgressBar.qml
index 33e1fdfd..b49f7f8c 100644
--- a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/ProgressBar.qml
+++ b/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/ProgressBar.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/RssModel.qml b/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/RssModel.qml
index 75c86c46..5dcc14a2 100644
--- a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/RssModel.qml
+++ b/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/RssModel.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/Tag.qml b/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/Tag.qml
index 30695140..f60bf02b 100644
--- a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/Tag.qml
+++ b/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/Tag.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/photoviewer/qml/photoviewer/photoviewer.qml b/demos/declarative/photoviewer/qml/photoviewer/photoviewer.qml
index 049e9ca5..e53e1b3e 100644
--- a/demos/declarative/photoviewer/qml/photoviewer/photoviewer.qml
+++ b/demos/declarative/photoviewer/qml/photoviewer/photoviewer.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/rssnews/main.cpp b/demos/declarative/rssnews/main.cpp
index 862834fe..361f2842 100644
--- a/demos/declarative/rssnews/main.cpp
+++ b/demos/declarative/rssnews/main.cpp
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/rssnews/qml/rssnews/content/BusyIndicator.qml b/demos/declarative/rssnews/qml/rssnews/content/BusyIndicator.qml
index 9f1fa5a0..f74159d9 100644
--- a/demos/declarative/rssnews/qml/rssnews/content/BusyIndicator.qml
+++ b/demos/declarative/rssnews/qml/rssnews/content/BusyIndicator.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/rssnews/qml/rssnews/content/CategoryDelegate.qml b/demos/declarative/rssnews/qml/rssnews/content/CategoryDelegate.qml
index 568acce0..9bb663e4 100644
--- a/demos/declarative/rssnews/qml/rssnews/content/CategoryDelegate.qml
+++ b/demos/declarative/rssnews/qml/rssnews/content/CategoryDelegate.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/rssnews/qml/rssnews/content/NewsDelegate.qml b/demos/declarative/rssnews/qml/rssnews/content/NewsDelegate.qml
index e709de4e..eba36a00 100644
--- a/demos/declarative/rssnews/qml/rssnews/content/NewsDelegate.qml
+++ b/demos/declarative/rssnews/qml/rssnews/content/NewsDelegate.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/rssnews/qml/rssnews/content/RssFeeds.qml b/demos/declarative/rssnews/qml/rssnews/content/RssFeeds.qml
index 028e2039..67b45425 100644
--- a/demos/declarative/rssnews/qml/rssnews/content/RssFeeds.qml
+++ b/demos/declarative/rssnews/qml/rssnews/content/RssFeeds.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/rssnews/qml/rssnews/content/ScrollBar.qml b/demos/declarative/rssnews/qml/rssnews/content/ScrollBar.qml
index 109aa0ca..15e33d01 100644
--- a/demos/declarative/rssnews/qml/rssnews/content/ScrollBar.qml
+++ b/demos/declarative/rssnews/qml/rssnews/content/ScrollBar.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/rssnews/qml/rssnews/rssnews.qml b/demos/declarative/rssnews/qml/rssnews/rssnews.qml
index 6b0e830a..4a9abdfd 100644
--- a/demos/declarative/rssnews/qml/rssnews/rssnews.qml
+++ b/demos/declarative/rssnews/qml/rssnews/rssnews.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/samegame/main.cpp b/demos/declarative/samegame/main.cpp
index 6ef94e85..47ffc7dc 100644
--- a/demos/declarative/samegame/main.cpp
+++ b/demos/declarative/samegame/main.cpp
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/samegame/qml/samegame/SamegameCore/BoomBlock.qml b/demos/declarative/samegame/qml/samegame/SamegameCore/BoomBlock.qml
index b244238b..267b1fe7 100644
--- a/demos/declarative/samegame/qml/samegame/SamegameCore/BoomBlock.qml
+++ b/demos/declarative/samegame/qml/samegame/SamegameCore/BoomBlock.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/samegame/qml/samegame/SamegameCore/Button.qml b/demos/declarative/samegame/qml/samegame/SamegameCore/Button.qml
index df7ac56f..cff61cb4 100644
--- a/demos/declarative/samegame/qml/samegame/SamegameCore/Button.qml
+++ b/demos/declarative/samegame/qml/samegame/SamegameCore/Button.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/samegame/qml/samegame/SamegameCore/Dialog.qml b/demos/declarative/samegame/qml/samegame/SamegameCore/Dialog.qml
index 3c86f366..011f3656 100644
--- a/demos/declarative/samegame/qml/samegame/SamegameCore/Dialog.qml
+++ b/demos/declarative/samegame/qml/samegame/SamegameCore/Dialog.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/samegame/qml/samegame/samegame.qml b/demos/declarative/samegame/qml/samegame/samegame.qml
index ee8898af..4922fb53 100644
--- a/demos/declarative/samegame/qml/samegame/samegame.qml
+++ b/demos/declarative/samegame/qml/samegame/samegame.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/snake/main.cpp b/demos/declarative/snake/main.cpp
index 11241cf4..04723784 100644
--- a/demos/declarative/snake/main.cpp
+++ b/demos/declarative/snake/main.cpp
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/snake/qml/snake/content/Button.qml b/demos/declarative/snake/qml/snake/content/Button.qml
index 6142b1b0..7fa05f9d 100644
--- a/demos/declarative/snake/qml/snake/content/Button.qml
+++ b/demos/declarative/snake/qml/snake/content/Button.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/snake/qml/snake/content/Cookie.qml b/demos/declarative/snake/qml/snake/content/Cookie.qml
index b7a3aea6..bb71dfbb 100644
--- a/demos/declarative/snake/qml/snake/content/Cookie.qml
+++ b/demos/declarative/snake/qml/snake/content/Cookie.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/snake/qml/snake/content/HighScoreModel.qml b/demos/declarative/snake/qml/snake/content/HighScoreModel.qml
index d8d29b79..623de0c4 100644
--- a/demos/declarative/snake/qml/snake/content/HighScoreModel.qml
+++ b/demos/declarative/snake/qml/snake/content/HighScoreModel.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/snake/qml/snake/content/Link.qml b/demos/declarative/snake/qml/snake/content/Link.qml
index 71c93a02..20c56cc3 100644
--- a/demos/declarative/snake/qml/snake/content/Link.qml
+++ b/demos/declarative/snake/qml/snake/content/Link.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/snake/qml/snake/content/Skull.qml b/demos/declarative/snake/qml/snake/content/Skull.qml
index a7ab2e88..da77d417 100644
--- a/demos/declarative/snake/qml/snake/content/Skull.qml
+++ b/demos/declarative/snake/qml/snake/content/Skull.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/snake/qml/snake/snake.qml b/demos/declarative/snake/qml/snake/snake.qml
index 54e947f9..5738ac53 100644
--- a/demos/declarative/snake/qml/snake/snake.qml
+++ b/demos/declarative/snake/qml/snake/snake.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/twitter/main.cpp b/demos/declarative/twitter/main.cpp
index 24948847..004e597b 100644
--- a/demos/declarative/twitter/main.cpp
+++ b/demos/declarative/twitter/main.cpp
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/Button.qml b/demos/declarative/twitter/qml/twitter/TwitterCore/Button.qml
index 75ea7a65..860dca54 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/Button.qml
+++ b/demos/declarative/twitter/qml/twitter/TwitterCore/Button.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/FatDelegate.qml b/demos/declarative/twitter/qml/twitter/TwitterCore/FatDelegate.qml
index 2965493e..bcfaf1e7 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/FatDelegate.qml
+++ b/demos/declarative/twitter/qml/twitter/TwitterCore/FatDelegate.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/Input.qml b/demos/declarative/twitter/qml/twitter/TwitterCore/Input.qml
index 4eb0dfc1..8baf16fa 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/Input.qml
+++ b/demos/declarative/twitter/qml/twitter/TwitterCore/Input.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/Loading.qml b/demos/declarative/twitter/qml/twitter/TwitterCore/Loading.qml
index 65d888fb..40eb5a9f 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/Loading.qml
+++ b/demos/declarative/twitter/qml/twitter/TwitterCore/Loading.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/MultiTitleBar.qml b/demos/declarative/twitter/qml/twitter/TwitterCore/MultiTitleBar.qml
index d5b2aae8..fc1dffe9 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/MultiTitleBar.qml
+++ b/demos/declarative/twitter/qml/twitter/TwitterCore/MultiTitleBar.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/RssModel.qml b/demos/declarative/twitter/qml/twitter/TwitterCore/RssModel.qml
index c512df31..e3d85505 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/RssModel.qml
+++ b/demos/declarative/twitter/qml/twitter/TwitterCore/RssModel.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/SearchView.qml b/demos/declarative/twitter/qml/twitter/TwitterCore/SearchView.qml
index 5bc209f6..1c4b816e 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/SearchView.qml
+++ b/demos/declarative/twitter/qml/twitter/TwitterCore/SearchView.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/TitleBar.qml b/demos/declarative/twitter/qml/twitter/TwitterCore/TitleBar.qml
index 795e8533..8fbc8072 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/TitleBar.qml
+++ b/demos/declarative/twitter/qml/twitter/TwitterCore/TitleBar.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/ToolBar.qml b/demos/declarative/twitter/qml/twitter/TwitterCore/ToolBar.qml
index b62298e1..a64ee5f4 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/ToolBar.qml
+++ b/demos/declarative/twitter/qml/twitter/TwitterCore/ToolBar.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/UserModel.qml b/demos/declarative/twitter/qml/twitter/TwitterCore/UserModel.qml
index a6fb67de..29633f54 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/UserModel.qml
+++ b/demos/declarative/twitter/qml/twitter/TwitterCore/UserModel.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/declarative/twitter/qml/twitter/twitter.qml b/demos/declarative/twitter/qml/twitter/twitter.qml
index e4c891c7..739ad170 100644
--- a/demos/declarative/twitter/qml/twitter/twitter.qml
+++ b/demos/declarative/twitter/qml/twitter/twitter.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -35,6 +35,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp
index d8a9336b..3eeac6c4 100644
--- a/demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtCore module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/helper/qmlapplicationviewer/qmlapplicationviewer.h b/demos/helper/qmlapplicationviewer/qmlapplicationviewer.h
index d8ef27e0..d6c94d31 100644
--- a/demos/helper/qmlapplicationviewer/qmlapplicationviewer.h
+++ b/demos/helper/qmlapplicationviewer/qmlapplicationviewer.h
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtCore module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/guitartuner/src/application.qml b/demos/mobile/guitartuner/src/application.qml
index c18e64c5..7a078451 100644
--- a/demos/mobile/guitartuner/src/application.qml
+++ b/demos/mobile/guitartuner/src/application.qml
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/guitartuner/src/constants.h b/demos/mobile/guitartuner/src/constants.h
index ab53cbea..10ac0073 100644
--- a/demos/mobile/guitartuner/src/constants.h
+++ b/demos/mobile/guitartuner/src/constants.h
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/guitartuner/src/fastfouriertransformer.cpp b/demos/mobile/guitartuner/src/fastfouriertransformer.cpp
index 275d36b2..684483fc 100644
--- a/demos/mobile/guitartuner/src/fastfouriertransformer.cpp
+++ b/demos/mobile/guitartuner/src/fastfouriertransformer.cpp
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/guitartuner/src/fastfouriertransformer.h b/demos/mobile/guitartuner/src/fastfouriertransformer.h
index b8064f7a..8b5f272b 100644
--- a/demos/mobile/guitartuner/src/fastfouriertransformer.h
+++ b/demos/mobile/guitartuner/src/fastfouriertransformer.h
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/guitartuner/src/fftpack.c b/demos/mobile/guitartuner/src/fftpack.c
index 43109408..84e72525 100644
--- a/demos/mobile/guitartuner/src/fftpack.c
+++ b/demos/mobile/guitartuner/src/fftpack.c
@@ -34,6 +34,7 @@
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/guitartuner/src/guitartuner.cpp b/demos/mobile/guitartuner/src/guitartuner.cpp
index 35c553b3..8622e4bd 100644
--- a/demos/mobile/guitartuner/src/guitartuner.cpp
+++ b/demos/mobile/guitartuner/src/guitartuner.cpp
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/guitartuner/src/guitartuner.h b/demos/mobile/guitartuner/src/guitartuner.h
index fdac53fa..1e1d6edb 100644
--- a/demos/mobile/guitartuner/src/guitartuner.h
+++ b/demos/mobile/guitartuner/src/guitartuner.h
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/guitartuner/src/guitartunerui.cpp b/demos/mobile/guitartuner/src/guitartunerui.cpp
index 24357b3b..4bbfaa70 100644
--- a/demos/mobile/guitartuner/src/guitartunerui.cpp
+++ b/demos/mobile/guitartuner/src/guitartunerui.cpp
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/guitartuner/src/guitartunerui.h b/demos/mobile/guitartuner/src/guitartunerui.h
index 79c92e3e..0a800e6d 100644
--- a/demos/mobile/guitartuner/src/guitartunerui.h
+++ b/demos/mobile/guitartuner/src/guitartunerui.h
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/guitartuner/src/main.cpp b/demos/mobile/guitartuner/src/main.cpp
index 39307934..140c74cc 100644
--- a/demos/mobile/guitartuner/src/main.cpp
+++ b/demos/mobile/guitartuner/src/main.cpp
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/guitartuner/src/mycomponents/Adjuster.qml b/demos/mobile/guitartuner/src/mycomponents/Adjuster.qml
index e5e67eb8..d9147599 100644
--- a/demos/mobile/guitartuner/src/mycomponents/Adjuster.qml
+++ b/demos/mobile/guitartuner/src/mycomponents/Adjuster.qml
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/guitartuner/src/mycomponents/Meter.qml b/demos/mobile/guitartuner/src/mycomponents/Meter.qml
index 1b175493..2e46edd6 100644
--- a/demos/mobile/guitartuner/src/mycomponents/Meter.qml
+++ b/demos/mobile/guitartuner/src/mycomponents/Meter.qml
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/guitartuner/src/mycomponents/NoteButtonView.qml b/demos/mobile/guitartuner/src/mycomponents/NoteButtonView.qml
index 04a78dd4..ed49a902 100644
--- a/demos/mobile/guitartuner/src/mycomponents/NoteButtonView.qml
+++ b/demos/mobile/guitartuner/src/mycomponents/NoteButtonView.qml
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/guitartuner/src/mycomponents/NotesModel.qml b/demos/mobile/guitartuner/src/mycomponents/NotesModel.qml
index 1aecc051..d5290c12 100644
--- a/demos/mobile/guitartuner/src/mycomponents/NotesModel.qml
+++ b/demos/mobile/guitartuner/src/mycomponents/NotesModel.qml
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/guitartuner/src/mycomponents/ToggleButton.qml b/demos/mobile/guitartuner/src/mycomponents/ToggleButton.qml
index de46b9f0..f717b960 100644
--- a/demos/mobile/guitartuner/src/mycomponents/ToggleButton.qml
+++ b/demos/mobile/guitartuner/src/mycomponents/ToggleButton.qml
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/guitartuner/src/mycomponents/adjustbars.js b/demos/mobile/guitartuner/src/mycomponents/adjustbars.js
index ba652a6f..e4710ce7 100644
--- a/demos/mobile/guitartuner/src/mycomponents/adjustbars.js
+++ b/demos/mobile/guitartuner/src/mycomponents/adjustbars.js
@@ -34,6 +34,7 @@
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/guitartuner/src/voiceanalyzer.cpp b/demos/mobile/guitartuner/src/voiceanalyzer.cpp
index 5c179638..12d7a2bf 100644
--- a/demos/mobile/guitartuner/src/voiceanalyzer.cpp
+++ b/demos/mobile/guitartuner/src/voiceanalyzer.cpp
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/guitartuner/src/voiceanalyzer.h b/demos/mobile/guitartuner/src/voiceanalyzer.h
index 8957c2e9..b53d0ecc 100644
--- a/demos/mobile/guitartuner/src/voiceanalyzer.h
+++ b/demos/mobile/guitartuner/src/voiceanalyzer.h
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/guitartuner/src/voicegenerator.cpp b/demos/mobile/guitartuner/src/voicegenerator.cpp
index 046f75ef..0b278000 100644
--- a/demos/mobile/guitartuner/src/voicegenerator.cpp
+++ b/demos/mobile/guitartuner/src/voicegenerator.cpp
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/guitartuner/src/voicegenerator.h b/demos/mobile/guitartuner/src/voicegenerator.h
index ed2292b7..ab5a86e2 100644
--- a/demos/mobile/guitartuner/src/voicegenerator.h
+++ b/demos/mobile/guitartuner/src/voicegenerator.h
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/qtbubblelevel/accelerometerfilter.cpp b/demos/mobile/qtbubblelevel/accelerometerfilter.cpp
index b8a0eb77..eac9d927 100644
--- a/demos/mobile/qtbubblelevel/accelerometerfilter.cpp
+++ b/demos/mobile/qtbubblelevel/accelerometerfilter.cpp
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/qtbubblelevel/accelerometerfilter.h b/demos/mobile/qtbubblelevel/accelerometerfilter.h
index 006df84f..c890eae7 100644
--- a/demos/mobile/qtbubblelevel/accelerometerfilter.h
+++ b/demos/mobile/qtbubblelevel/accelerometerfilter.h
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/qtbubblelevel/main.cpp b/demos/mobile/qtbubblelevel/main.cpp
index a8de03c4..f16921e9 100644
--- a/demos/mobile/qtbubblelevel/main.cpp
+++ b/demos/mobile/qtbubblelevel/main.cpp
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/qtbubblelevel/qml/BubbleLevel.qml b/demos/mobile/qtbubblelevel/qml/BubbleLevel.qml
index 7041ba60..ed9420e3 100644
--- a/demos/mobile/qtbubblelevel/qml/BubbleLevel.qml
+++ b/demos/mobile/qtbubblelevel/qml/BubbleLevel.qml
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/qtbubblelevel/qml/Button.qml b/demos/mobile/qtbubblelevel/qml/Button.qml
index 12d1a377..24ae4efb 100644
--- a/demos/mobile/qtbubblelevel/qml/Button.qml
+++ b/demos/mobile/qtbubblelevel/qml/Button.qml
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/qtbubblelevel/qml/Tube.qml b/demos/mobile/qtbubblelevel/qml/Tube.qml
index 609139ec..184c0e71 100644
--- a/demos/mobile/qtbubblelevel/qml/Tube.qml
+++ b/demos/mobile/qtbubblelevel/qml/Tube.qml
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/qtbubblelevel/settings.h b/demos/mobile/qtbubblelevel/settings.h
index 0015438a..a0ae6fbf 100644
--- a/demos/mobile/qtbubblelevel/settings.h
+++ b/demos/mobile/qtbubblelevel/settings.h
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/qtbubblelevel/taskswitcher.cpp b/demos/mobile/qtbubblelevel/taskswitcher.cpp
index 03e70309..1e55236a 100644
--- a/demos/mobile/qtbubblelevel/taskswitcher.cpp
+++ b/demos/mobile/qtbubblelevel/taskswitcher.cpp
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/qtbubblelevel/taskswitcher.h b/demos/mobile/qtbubblelevel/taskswitcher.h
index e2f09509..33ed6c2e 100644
--- a/demos/mobile/qtbubblelevel/taskswitcher.h
+++ b/demos/mobile/qtbubblelevel/taskswitcher.h
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/quickhit/Button.qml b/demos/mobile/quickhit/Button.qml
index edfbebb7..e02cc1e0 100644
--- a/demos/mobile/quickhit/Button.qml
+++ b/demos/mobile/quickhit/Button.qml
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/quickhit/Game.js b/demos/mobile/quickhit/Game.js
index d1792efd..5291a527 100644
--- a/demos/mobile/quickhit/Game.js
+++ b/demos/mobile/quickhit/Game.js
@@ -34,6 +34,7 @@
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/quickhit/Game.qml b/demos/mobile/quickhit/Game.qml
index 70f903d1..6b7597b9 100644
--- a/demos/mobile/quickhit/Game.qml
+++ b/demos/mobile/quickhit/Game.qml
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/quickhit/InvSounds.cpp b/demos/mobile/quickhit/InvSounds.cpp
index ac926a74..13c8134f 100644
--- a/demos/mobile/quickhit/InvSounds.cpp
+++ b/demos/mobile/quickhit/InvSounds.cpp
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/quickhit/InvSounds.h b/demos/mobile/quickhit/InvSounds.h
index f5254ed6..c2371577 100644
--- a/demos/mobile/quickhit/InvSounds.h
+++ b/demos/mobile/quickhit/InvSounds.h
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/quickhit/Menu.qml b/demos/mobile/quickhit/Menu.qml
index daf3ccff..8d4ccfd0 100644
--- a/demos/mobile/quickhit/Menu.qml
+++ b/demos/mobile/quickhit/Menu.qml
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/quickhit/MenuItem.qml b/demos/mobile/quickhit/MenuItem.qml
index 7203c530..7f0c5f50 100644
--- a/demos/mobile/quickhit/MenuItem.qml
+++ b/demos/mobile/quickhit/MenuItem.qml
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/quickhit/Message.qml b/demos/mobile/quickhit/Message.qml
index 618a1a39..f3632bde 100644
--- a/demos/mobile/quickhit/Message.qml
+++ b/demos/mobile/quickhit/Message.qml
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/quickhit/Missile.qml b/demos/mobile/quickhit/Missile.qml
index 57e48c4f..43b0bf06 100644
--- a/demos/mobile/quickhit/Missile.qml
+++ b/demos/mobile/quickhit/Missile.qml
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/quickhit/MyShip.qml b/demos/mobile/quickhit/MyShip.qml
index 3b02ac51..5ac94ee1 100644
--- a/demos/mobile/quickhit/MyShip.qml
+++ b/demos/mobile/quickhit/MyShip.qml
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/quickhit/ga_src/GEAudioBuffer.cpp b/demos/mobile/quickhit/ga_src/GEAudioBuffer.cpp
index 4a5f55dd..f693366b 100644
--- a/demos/mobile/quickhit/ga_src/GEAudioBuffer.cpp
+++ b/demos/mobile/quickhit/ga_src/GEAudioBuffer.cpp
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/quickhit/ga_src/GEAudioBuffer.h b/demos/mobile/quickhit/ga_src/GEAudioBuffer.h
index b8c0cf57..c255ee5b 100644
--- a/demos/mobile/quickhit/ga_src/GEAudioBuffer.h
+++ b/demos/mobile/quickhit/ga_src/GEAudioBuffer.h
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/quickhit/ga_src/GEAudioOut.cpp b/demos/mobile/quickhit/ga_src/GEAudioOut.cpp
index a7772649..19fc9437 100644
--- a/demos/mobile/quickhit/ga_src/GEAudioOut.cpp
+++ b/demos/mobile/quickhit/ga_src/GEAudioOut.cpp
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/quickhit/ga_src/GEAudioOut.h b/demos/mobile/quickhit/ga_src/GEAudioOut.h
index 2a3e3953..bc04825c 100644
--- a/demos/mobile/quickhit/ga_src/GEAudioOut.h
+++ b/demos/mobile/quickhit/ga_src/GEAudioOut.h
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/quickhit/ga_src/GEInterfaces.cpp b/demos/mobile/quickhit/ga_src/GEInterfaces.cpp
index 7771f58c..a264cad7 100644
--- a/demos/mobile/quickhit/ga_src/GEInterfaces.cpp
+++ b/demos/mobile/quickhit/ga_src/GEInterfaces.cpp
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/quickhit/ga_src/GEInterfaces.h b/demos/mobile/quickhit/ga_src/GEInterfaces.h
index 552f554b..cbe00290 100644
--- a/demos/mobile/quickhit/ga_src/GEInterfaces.h
+++ b/demos/mobile/quickhit/ga_src/GEInterfaces.h
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/quickhit/gameengine.cpp b/demos/mobile/quickhit/gameengine.cpp
index 4763268f..f1a7f232 100644
--- a/demos/mobile/quickhit/gameengine.cpp
+++ b/demos/mobile/quickhit/gameengine.cpp
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/quickhit/gameengine.h b/demos/mobile/quickhit/gameengine.h
index 79811d2b..605a879e 100644
--- a/demos/mobile/quickhit/gameengine.h
+++ b/demos/mobile/quickhit/gameengine.h
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/quickhit/main.cpp b/demos/mobile/quickhit/main.cpp
index fbfd4ceb..9f9f60da 100644
--- a/demos/mobile/quickhit/main.cpp
+++ b/demos/mobile/quickhit/main.cpp
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/mobile/quickhit/mainwindow.cpp b/demos/mobile/quickhit/mainwindow.cpp
index 1d146aa6..6c64c0c1 100644
--- a/demos/mobile/quickhit/mainwindow.cpp
+++ b/demos/mobile/quickhit/mainwindow.cpp
@@ -4,36 +4,38 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions