qt:qt.git
10 years agoClose the comments on some examples.
Casper van Donderen [Thu, 24 Nov 2011 15:11:14 +0000 (16:11 +0100)]
Close the comments on some examples.

10 years agoUpdate documentation for QML examples.
Casper van Donderen [Thu, 24 Nov 2011 13:36:56 +0000 (14:36 +0100)]
Update documentation for QML examples.

10 years agoCompile fix for Mac OS X.
Daniel Molkentin [Thu, 24 Nov 2011 09:02:58 +0000 (10:02 +0100)]
Compile fix for Mac OS X.

Reviewed-By; Casper van Donderen

10 years agoFix build error: specifying full path to pro file is required here.
Daniel Molkentin [Wed, 23 Nov 2011 14:24:24 +0000 (15:24 +0100)]
Fix build error: specifying full path to pro file is required here.

Reviewed-By: Oswald Buddenhagen
10 years agoFix manifest install rule on windows
Daniel Molkentin [Wed, 23 Nov 2011 12:57:13 +0000 (13:57 +0100)]
Fix manifest install rule on windows

Reviewed-by: Oswald Buddenhagen
10 years agoAdd note to declarative calculator example
Daniel Molkentin [Tue, 22 Nov 2011 18:18:37 +0000 (19:18 +0100)]
Add note to declarative calculator example

This example is not meant to be executed without qmlviewer, yet most
of it works. Add a warning for the uninitiated.

Reviewed-by: trustme
10 years agoHelp: Add \depends to all declarative examples & demos
Daniel Molkentin [Tue, 22 Nov 2011 18:16:13 +0000 (19:16 +0100)]
Help: Add \depends to all declarative examples & demos

Reviwed-By: trustme
10 years agoDeclarative Examples: Fall back to local qmlapplicationviewer.
Daniel Molkentin [Tue, 22 Nov 2011 18:13:14 +0000 (19:13 +0100)]
Declarative Examples: Fall back to local qmlapplicationviewer.

Rubberstamped-by: Oswald Buddenhagen
10 years agoFix qdoc output for <dependency> tag.
Daniel Molkentin [Tue, 22 Nov 2011 16:05:48 +0000 (17:05 +0100)]
Fix qdoc output for <dependency> tag.

Also prepend relative path if required.

Reviewed-By: trustme
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging
Casper van Donderen [Tue, 22 Nov 2011 16:02:57 +0000 (17:02 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging

10 years agoChange installation location of examples.
Casper van Donderen [Tue, 22 Nov 2011 16:01:55 +0000 (17:01 +0100)]
Change installation location of examples.

The cppextensions examples were still installed to a previous location,
the files had been moved within the source tree, but the .pro files
were not changed accordingly.

10 years agoAdd Symbian platform notes.
Casper van Donderen [Tue, 22 Nov 2011 15:34:03 +0000 (16:34 +0100)]
Add Symbian platform notes.

10 years agoFix "make install" for declarative examples
Daniel Molkentin [Tue, 22 Nov 2011 12:48:40 +0000 (13:48 +0100)]
Fix "make install" for declarative examples

Reviewed-by: Oswald Buddenhagen
10 years agoAdd C++11 support and QThreadLocalStorage changes to docs.
Casper van Donderen [Tue, 22 Nov 2011 11:44:40 +0000 (12:44 +0100)]
Add C++11 support and QThreadLocalStorage changes to docs.

The C++11 support was not documented in the "What's new" page.

Reviewed-By: Frederik Gladhorn
10 years agoMerge remote-tracking branch 'qt-doc-review/master'
Casper van Donderen [Tue, 22 Nov 2011 11:37:49 +0000 (12:37 +0100)]
Merge remote-tracking branch 'qt-doc-review/master'

10 years agoUpdate the license in the qmlapplicationviewer.
Casper van Donderen [Tue, 22 Nov 2011 10:24:49 +0000 (11:24 +0100)]
Update the license in the qmlapplicationviewer.

The license had too many comments in them, these are now removed

Reviewed-By: Trust me
10 years agoExamples: Add Copright headers, Remove stray file.
Daniel Molkentin [Mon, 21 Nov 2011 13:27:38 +0000 (14:27 +0100)]
Examples: Add Copright headers, Remove stray file.

Reviewed-by: trustme
10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Mon, 21 Nov 2011 17:42:02 +0000 (03:42 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team:
  qdoc3: qdoc supports \depends in 4.8

10 years agoCompile fix.
Daniel Molkentin [Mon, 21 Nov 2011 13:17:51 +0000 (14:17 +0100)]
Compile fix.

Reviewed-by: trustme
10 years agoFix use of qmlapplicationviewer.
Daniel Molkentin [Mon, 21 Nov 2011 12:24:20 +0000 (13:24 +0100)]
Fix use of qmlapplicationviewer.

- Two separate copies for demos and example
- Fix deployment (don't install to opt in desktop case)

Reviewed-by: Casper van Donderen
10 years agoDoc: Create relative pathes in Manifest files.
Daniel Molkentin [Fri, 18 Nov 2011 10:10:50 +0000 (11:10 +0100)]
Doc: Create relative pathes in Manifest files.

Conditions: shadow build & non-prefix build

Reviewed-by: Casper van Donderen
10 years agoDoc: Copy manifest files to the places where Creator expects them.
Daniel Molkentin [Thu, 17 Nov 2011 17:51:26 +0000 (18:51 +0100)]
Doc: Copy manifest files to the places where Creator expects them.

Reviewed-by: Casper van Donderen
10 years agoqdoc3: qdoc supports \depends in 4.8
Martin Smith [Mon, 21 Nov 2011 12:38:13 +0000 (13:38 +0100)]
qdoc3: qdoc supports \depends in 4.8

This is what you write...

/*!
\example designer/calculatorbuilder
\depends qmlapplicationviewer
\title Calculator Builder Example

This is what you get...

<example name="Calculator Builder Example"
        docUrl="qthelp://com.trolltech.qt.480/qdoc/designer-calculatorbuilder.html"
        projectPath="designer/calculatorbuilder/calculatorbuilder.pro"
        imageUrl="qthelp://com.trolltech.qt.480/qdoc/images/calculatorbuilder-example.png">
<description><![CDATA[The Calculator Builder example shows how to create a user interface from
             a Qt Designer form at run-time, using the QUiLoader class.]]></description>
<tags>calculator,builder</tags>
<fileToOpen>designer/calculatorbuilder/main.cpp</fileToOpen>
<dependency>$QTDIR/examples/qmlapplicationviewer</dependency>
</example>

Task-number:  QTBUG-22838

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Mon, 21 Nov 2011 11:53:44 +0000 (21:53 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team:
  qdoc3: qdoc supports \depends in 4.8

10 years agoqdoc3: qdoc supports \depends in 4.8
Martin Smith [Mon, 21 Nov 2011 11:51:01 +0000 (12:51 +0100)]
qdoc3: qdoc supports \depends in 4.8

This is what you write...

/*!
\example designer/calculatorbuilder
\depends examples/qmlapplicationviewer
\title Calculator Builder Example

This is what you get...

<example name="Calculator Builder Example"
        docUrl="qthelp://com.trolltech.qt.480/qdoc/designer-calculatorbuilder.html"
        projectPath="designer/calculatorbuilder/calculatorbuilder.pro"
        imageUrl="qthelp://com.trolltech.qt.480/qdoc/images/calculatorbuilder-example.png">
<description><![CDATA[The Calculator Builder example shows how to create a user interface from
             a Qt Designer form at run-time, using the QUiLoader class.]]></description>
<tags>calculator,builder</tags>
<fileToOpen>designer/calculatorbuilder/main.cpp</fileToOpen>
<depends>../../examples/qmlapplicationviewer</depends>
</example>

Task-number:  QTBUG-22838

10 years agoUpdate qrc files.
Casper van Donderen [Fri, 18 Nov 2011 11:20:23 +0000 (12:20 +0100)]
Update qrc files.

The qml files were moved within the examples, the qrc files were not
updated accordingly. This change fixes the problem.

Reviewed-By: Daniel Molkentin
10 years agoUpdate qmlapplicationviewer template,
Casper van Donderen [Thu, 17 Nov 2011 15:03:14 +0000 (16:03 +0100)]
Update qmlapplicationviewer template,

The previous version of the template did not work on Harmattan, It
caused the application executable to look in the $HOME directory,
instead of the application directory.

Reviewed-By: Daniel Molkentin
10 years agocppextensions/qgraphicslayout example corrections
artoka [Thu, 17 Nov 2011 14:50:20 +0000 (15:50 +0100)]
cppextensions/qgraphicslayout example corrections

Cleaned qgraphicsgridlayout.pro and qgraphicslinearlayout.pro files.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agodemos/declarative/snake example corrections
artoka [Thu, 17 Nov 2011 14:50:20 +0000 (15:50 +0100)]
demos/declarative/snake example corrections

Removed empty lines from snake.qml and Cookie.qml

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agodemos/declarative/webbrowser example modifications
artoka [Thu, 17 Nov 2011 14:50:19 +0000 (15:50 +0100)]
demos/declarative/webbrowser example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agodemos/declarative/twitter example modifications
artoka [Thu, 17 Nov 2011 14:50:18 +0000 (15:50 +0100)]
demos/declarative/twitter example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agodemos/declarative/snake example modifications
artoka [Thu, 17 Nov 2011 14:50:17 +0000 (15:50 +0100)]
demos/declarative/snake example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agodemos/declarative/samegame example modifications
artoka [Thu, 17 Nov 2011 14:50:16 +0000 (15:50 +0100)]
demos/declarative/samegame example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agodemos/declarative/rssnews example modifications
artoka [Thu, 17 Nov 2011 14:50:15 +0000 (15:50 +0100)]
demos/declarative/rssnews example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agodemos/declarative/photoviewer example modifications
artoka [Thu, 17 Nov 2011 14:50:14 +0000 (15:50 +0100)]
demos/declarative/photoviewer example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agodemos/declarative/minehunt example modifications
artoka [Thu, 17 Nov 2011 14:50:14 +0000 (15:50 +0100)]
demos/declarative/minehunt example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agodemos/declarative/flickr example modifications
artoka [Thu, 17 Nov 2011 14:50:13 +0000 (15:50 +0100)]
demos/declarative/flickr example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agodemos/declarative/calculator example modifications
artoka [Thu, 17 Nov 2011 14:50:12 +0000 (15:50 +0100)]
demos/declarative/calculator example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoxml/xmlhttprequestexample example modifications
artoka [Thu, 17 Nov 2011 14:50:11 +0000 (15:50 +0100)]
xml/xmlhttprequestexample example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoui-components/tabwidget example modifications
artoka [Thu, 17 Nov 2011 14:50:10 +0000 (15:50 +0100)]
ui-components/tabwidget example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoui-components/spinner example modifications
artoka [Thu, 17 Nov 2011 14:50:09 +0000 (15:50 +0100)]
ui-components/spinner example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoui-components/slideswitch example modifications
artoka [Thu, 17 Nov 2011 14:50:08 +0000 (15:50 +0100)]
ui-components/slideswitch example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoui-components/searchbox example modifications
artoka [Thu, 17 Nov 2011 14:50:08 +0000 (15:50 +0100)]
ui-components/searchbox example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoui-components/scrollbar example modifications
artoka [Thu, 17 Nov 2011 14:50:07 +0000 (15:50 +0100)]
ui-components/scrollbar example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoui-components/progressbar example modifications
artoka [Thu, 17 Nov 2011 14:50:06 +0000 (15:50 +0100)]
ui-components/progressbar example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoui-components/main example modifications
artoka [Thu, 17 Nov 2011 14:50:05 +0000 (15:50 +0100)]
ui-components/main example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoui-components/flipaple example modifications
artoka [Thu, 17 Nov 2011 14:50:04 +0000 (15:50 +0100)]
ui-components/flipaple example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoui-components/dialcontrol example modifications
artoka [Thu, 17 Nov 2011 14:50:03 +0000 (15:50 +0100)]
ui-components/dialcontrol example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoToys Examples Modifications
artoka [Thu, 17 Nov 2011 14:50:02 +0000 (15:50 +0100)]
Toys Examples Modifications

toys/ clocks, corkboards, dynamicscene, tic-tac-toe and tvtennis
example modifications

Modified examples to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoTouchintegration Examples Modifications
artoka [Thu, 17 Nov 2011 14:50:02 +0000 (15:50 +0100)]
Touchintegration Examples Modifications

touchintegration/ gestures, mousearea and pincharea example
modifications

Modified examples to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agothreading/ threadedlistmodel and workerscript example modifications
artoka [Thu, 17 Nov 2011 14:50:01 +0000 (15:50 +0100)]
threading/ threadedlistmodel and workerscript example modifications

Modified examples to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agotext/textselection example modifications
artoka [Thu, 17 Nov 2011 14:50:00 +0000 (15:50 +0100)]
text/textselection example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agotext/ availableFonts, banner, fonts and hello example modifications
artoka [Thu, 17 Nov 2011 14:49:59 +0000 (15:49 +0100)]
text/ availableFonts, banner, fonts and hello example modifications

Modified examples to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agosqllocalstorage example modifications
artoka [Thu, 17 Nov 2011 14:49:58 +0000 (15:49 +0100)]
sqllocalstorage example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoshadereffects example modifications
artoka [Thu, 17 Nov 2011 14:49:57 +0000 (15:49 +0100)]
shadereffects example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoRightToLeft Examples Modifications
artoka [Thu, 17 Nov 2011 14:49:56 +0000 (15:49 +0100)]
RightToLeft Examples Modifications

righttoleft/ layoutdirection, layoutmirroring and textalignment
example modifications

Modified examples to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agopositioners example modifications
artoka [Thu, 17 Nov 2011 14:49:55 +0000 (15:49 +0100)]
positioners example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agomodelviews/visualitemmodel example changes
artoka [Thu, 17 Nov 2011 14:49:55 +0000 (15:49 +0100)]
modelviews/visualitemmodel example changes

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoModelviews Examples Modifications
artoka [Thu, 17 Nov 2011 14:49:54 +0000 (15:49 +0100)]
Modelviews Examples Modifications

modelviews/webview/ alerts, autosize, googlemaps, inlinehtml and
newwindows example modifications

Modified examples to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agomodelviews/stringlistmodel example modifications
artoka [Thu, 17 Nov 2011 14:49:53 +0000 (15:49 +0100)]
modelviews/stringlistmodel example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agomodelviews/pathview example modifications
artoka [Thu, 17 Nov 2011 14:49:52 +0000 (15:49 +0100)]
modelviews/pathview example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agomodelviews/parallax example modifications
artoka [Thu, 17 Nov 2011 14:49:51 +0000 (15:49 +0100)]
modelviews/parallax example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agomodelviews/package example modifications
artoka [Thu, 17 Nov 2011 14:49:50 +0000 (15:49 +0100)]
modelviews/package example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agomodelview/objectlistmodel example modifications
artoka [Thu, 17 Nov 2011 14:49:49 +0000 (15:49 +0100)]
modelview/objectlistmodel example modifications

Modified example to use centralized qmlapplicationviewer, removed
duplicate files and modified project files according to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoModelview examples modifications.
artoka [Thu, 17 Nov 2011 14:49:48 +0000 (15:49 +0100)]
Modelview examples modifications.

modelviews\listview dynamiclist, expandingdelegates, highlight,
hightlightranges and sections example modifications

Modified the examples to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according to
the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agomodelviews/gridview-example example modifications
artoka [Thu, 17 Nov 2011 14:49:47 +0000 (15:49 +0100)]
modelviews/gridview-example example modifications

Modified the example to use centralized qmlapplicationviewer,
deleted duplicate files and modified the project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agomodelviews/delegate example modifications
artoka [Thu, 17 Nov 2011 14:49:46 +0000 (15:49 +0100)]
modelviews/delegate example modifications

Modified the project to use centralized qmlapplicationviewer,
deleted duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agomodelviews/abstractitemmodel example modifications
artoka [Thu, 17 Nov 2011 14:49:46 +0000 (15:49 +0100)]
modelviews/abstractitemmodel example modifications

Modified the project to use centralized qmlapplicationviewer,
deleted duplicate files and modified the project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agokeyintegration example modifications
artoka [Thu, 17 Nov 2011 14:49:45 +0000 (15:49 +0100)]
keyintegration example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according to
the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoimageelements/borderimage, image and shadows example modifications
artoka [Thu, 17 Nov 2011 14:49:44 +0000 (15:49 +0100)]
imageelements/borderimage, image and shadows example modifications

Modified the examples to use centralized qmlapplicationviewer,
removed duplicate files and modified the project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoi18n example modifications
artoka [Thu, 17 Nov 2011 14:49:43 +0000 (15:49 +0100)]
i18n example modifications

Modified the project to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according to
the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agocppextensions/qgraphicslayouts examples modifications
artoka [Thu, 17 Nov 2011 14:49:42 +0000 (15:49 +0100)]
cppextensions/qgraphicslayouts examples modifications

Modified projects to use centralized qmlapplicationviewer, removed
duplicated files and modified project files according to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agocppextensions/networkaccessmanagerfactory modifications
artoka [Thu, 17 Nov 2011 14:49:41 +0000 (15:49 +0100)]
cppextensions/networkaccessmanagerfactory modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicated files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoanimations/states example modifications
artoka [Thu, 17 Nov 2011 14:49:40 +0000 (15:49 +0100)]
animations/states example modifications

Modified the project to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according to
the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoanimation/easing example modifications
artoka [Thu, 17 Nov 2011 14:49:40 +0000 (15:49 +0100)]
animation/easing example modifications

Modified the project to use centralized qmlapplicationviewer,
removed duplicated files and modified project files according to
the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agobehaviors/behavior-example modifications
artoka [Thu, 17 Nov 2011 14:49:39 +0000 (15:49 +0100)]
behaviors/behavior-example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicated files and modified project files according to
the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoBasics example cleanup
artoka [Thu, 17 Nov 2011 14:49:38 +0000 (15:49 +0100)]
Basics example cleanup

Removed duplicated files from basics examples

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agobasics/property-animation modifications
artoka [Thu, 17 Nov 2011 14:49:37 +0000 (15:49 +0100)]
basics/property-animation modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicated files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoBasics/color-animation modifications
artoka [Thu, 17 Nov 2011 14:49:36 +0000 (15:49 +0100)]
Basics/color-animation modifications

Example was modified to use centralized qmlapplicationviewer,
duplicate files were removed, and project files updated.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoCentralized qmlapplicationviewer for declarative examples and demos
artoka [Thu, 17 Nov 2011 14:49:35 +0000 (15:49 +0100)]
Centralized qmlapplicationviewer for declarative examples and demos

These centralized qmlapplicationviewer files are used from declarative
examples and demos. Centralization decreases duplicate files and
eases maintaining.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoMerge remote-tracking branch 'mainline/4.8'
Casper van Donderen [Thu, 17 Nov 2011 14:48:38 +0000 (15:48 +0100)]
Merge remote-tracking branch 'mainline/4.8'

10 years agoUpdate Supported Platforms Documentation.
Casper van Donderen [Thu, 17 Nov 2011 11:44:43 +0000 (12:44 +0100)]
Update Supported Platforms Documentation.

WinXP MinGW, Win7 64-bit MSVC and Ubuntu 64-bit were added to the
documentation.

Reviewed-By: Antti Rajaniemi
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Thu, 17 Nov 2011 10:43:42 +0000 (20:43 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
  QNAM: make systemProxyForQuery respect http_proxy

10 years agoQNAM: make systemProxyForQuery respect http_proxy
Arvid Ephraim Picciani [Mon, 24 Oct 2011 14:41:44 +0000 (16:41 +0200)]
QNAM: make systemProxyForQuery respect http_proxy

the generic systemProxyForQuery will use http_proxy from the
environment, if it is set.

Change-Id: Ie685c47eb6df1fdd2ab223defc7172bb25e6fe30
Reviewed-by: Thiago Macieira (Intel) <thiago.macieira@intel.com>
(cherry picked from commit b22d290a37903f2c5ecfe58e8183cd293ead99dc)

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Wed, 16 Nov 2011 18:12:24 +0000 (04:12 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Rebuild configure.exe with support for MinGW 4.6
  Windows: Add gcc 4.6.

10 years agoMerge remote-tracking branch 'mainline/4.8'
Oswald Buddenhagen [Wed, 16 Nov 2011 15:23:36 +0000 (16:23 +0100)]
Merge remote-tracking branch 'mainline/4.8'

10 years agoRebuild configure.exe with support for MinGW 4.6
Friedemann Kleint [Wed, 16 Nov 2011 13:40:43 +0000 (14:40 +0100)]
Rebuild configure.exe with support for MinGW 4.6

See d4150975af620e2889cc58bd476bac6b4d101db3

10 years agoWindows: Add gcc 4.6.
Friedemann Kleint [Wed, 16 Nov 2011 08:53:38 +0000 (09:53 +0100)]
Windows: Add gcc 4.6.

- Add gcc 4.6 mkspec for > 4.4 (win32-g++-4.6)
- Add detection of g++ version and 64bit to configure.

Reviewed-by: mariusSO
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Wed, 16 Nov 2011 00:43:20 +0000 (10:43 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
  Add the ability to do unsafe SSL renegotiation as a fallback.

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Tue, 15 Nov 2011 20:46:52 +0000 (06:46 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (24 commits)
  Amend qfiledialog INTEGRITY patch
  Update to latest INTEGRITY Framebuffer API.
  Remove support for tilde expansion as there is no home on INTEGRITY.
  Remove docs and translations generation for INTEGRITY.
  Add XPLATFORM_INTEGRITY to define defaults for INTEGRITY.
  Remove QT 3 API support by default for INTEGRITY.
  Disable some tests because INTEGRITY doesn't support shared libraries.
  Add specific INTEGRITY cases for autotests requiring a target path.
  Improve default mkspec for INTEGRITY.
  Use Q_FUNC_INFO without line number on GHS compiler.
  Add INTEGRITY gbuild.* files to qmake project.
  Use the project root from .gpj project files, instead of local path.
  Make sure QMAKE_CXX is defined to prevent crashing on some projects.
  Add support for .pro-type subdirectories.
  Add relative path to the work directory, to prevent filename clashes.
  Only call moc if the file needs it.
  Use outname to specify the output .gpj to generate.
  Use "dll" instead of "shared".
  Instead of translating / into _, check if subdir is a .pro.
  Do not generate -D defines for project types.
  ...

10 years agoAmend qfiledialog INTEGRITY patch
Harald Fernengel [Tue, 15 Nov 2011 16:36:16 +0000 (17:36 +0100)]
Amend qfiledialog INTEGRITY patch

10 years agoUpdate to latest INTEGRITY Framebuffer API.
Rolland Dudemaine [Tue, 15 Nov 2011 16:28:38 +0000 (17:28 +0100)]
Update to latest INTEGRITY Framebuffer API.

Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
10 years agoRemove support for tilde expansion as there is no home on INTEGRITY.
Rolland Dudemaine [Tue, 15 Nov 2011 16:28:37 +0000 (17:28 +0100)]
Remove support for tilde expansion as there is no home on INTEGRITY.

Instead of removing each use of the function, make the function do
nearly nothing. If home support gets added (it is actually there when
user/group support is present with full-posix mode is used), then
this is trivial to remove.
Also, keeps changes minimal.

Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
10 years agoRemove docs and translations generation for INTEGRITY.
Rolland Dudemaine [Tue, 15 Nov 2011 16:28:36 +0000 (17:28 +0100)]
Remove docs and translations generation for INTEGRITY.

The source should only be used to build target code, in the context of building for INTEGRITY.

Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
10 years agoAdd XPLATFORM_INTEGRITY to define defaults for INTEGRITY.
Rolland Dudemaine [Tue, 15 Nov 2011 16:28:34 +0000 (17:28 +0100)]
Add XPLATFORM_INTEGRITY to define defaults for INTEGRITY.

Defaults are set for QT_INSTALL paths, and for various CFG_ defines.
Also set the input and framebuffer drivers to be used.
Also set the BUILD_PARTS to the reduced set that produce target code.
If using script and declarative, then these are added still.
Make the configuration explicitly "Qt for INTEGRITY".
Since *_DIR variables are set in the first part of the configuration, do not set them again in the generic code.

Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
10 years agoRemove QT 3 API support by default for INTEGRITY.
Rolland Dudemaine [Tue, 15 Nov 2011 16:28:33 +0000 (17:28 +0100)]
Remove QT 3 API support by default for INTEGRITY.

Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
10 years agoDisable some tests because INTEGRITY doesn't support shared libraries.
Rolland Dudemaine [Tue, 15 Nov 2011 16:28:32 +0000 (17:28 +0100)]
Disable some tests because INTEGRITY doesn't support shared libraries.

Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
10 years agoAdd specific INTEGRITY cases for autotests requiring a target path.
Rolland Dudemaine [Tue, 15 Nov 2011 16:28:31 +0000 (17:28 +0100)]
Add specific INTEGRITY cases for autotests requiring a target path.

SRCDIR is not parsed the same way due to the different qmake generation process.
furthermore, the full host path doesn't seem like a good idea to use for the path of the target filesystem.
Use "/" as default.

Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
10 years agoImprove default mkspec for INTEGRITY.
Rolland Dudemaine [Tue, 15 Nov 2011 16:28:29 +0000 (17:28 +0100)]
Improve default mkspec for INTEGRITY.

More specifically :
- add DEFINES for removing unsupported features
- disable one more warning
- specify non-shared-library mode
- add hiddev library to linker list
- fill debug mode flags

Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
10 years agoUse Q_FUNC_INFO without line number on GHS compiler.
Rolland Dudemaine [Tue, 15 Nov 2011 16:28:28 +0000 (17:28 +0100)]
Use Q_FUNC_INFO without line number on GHS compiler.

Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>