qt:qt.git
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Wed, 23 Nov 2011 01:41:59 +0000 (11:41 +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:
  Hide png symbols in a namespace for -qt-libpng

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Tue, 22 Nov 2011 21:34:44 +0000 (07:34 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (72 commits)
  Add note to declarative calculator example
  Help: Add \depends to all declarative examples & demos
  Declarative Examples: Fall back to local qmlapplicationviewer.
  Fix qdoc output for <dependency> tag.
  Change installation location of examples.
  Add Symbian platform notes.
  Fix "make install" for declarative examples
  Add C++11 support and QThreadLocalStorage changes to docs.
  Update the license in the qmlapplicationviewer.
  Examples: Add Copright headers, Remove stray file.
  Compile fix.
  Fix use of qmlapplicationviewer.
  Doc: Create relative pathes in Manifest files.
  Doc: Copy manifest files to the places where Creator expects them.
  qdoc3: qdoc supports \depends in 4.8
  qdoc3: qdoc supports \depends in 4.8
  Update qrc files.
  Update qmlapplicationviewer template,
  cppextensions/qgraphicslayout example corrections
  demos/declarative/snake example corrections
  ...

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 agoHide png symbols in a namespace for -qt-libpng
Daniel Teske [Tue, 22 Nov 2011 17:59:31 +0000 (18:59 +0100)]
Hide png symbols in a namespace for -qt-libpng

If qt is compiled with -qt-libpng then the png symbols
prevent a loading of another libpng. With this patch
the png symbols are hidden and thus it is possible
to load another libpng.

Reviewed-by: hjk <qtc-committer@nokia.com>
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Tue, 22 Nov 2011 17:19:38 +0000 (03:19 +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:
  Webkit: Work around C++11 string literal source incompatibility.
  Add spaces for string concatenation to work around C++11 source incompatibility.

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 agoWebkit: Work around C++11 string literal source incompatibility.
hjk [Tue, 22 Nov 2011 13:50:34 +0000 (14:50 +0100)]
Webkit: Work around C++11 string literal source incompatibility.

ISO/IEC 14882 2.2 Phases of translations: "user defined string literals"
are recognized as single preprocessor token in Phase 3, left unchanged by
"...preprocessing executed" in Phase 4. Previously, there were no user
defined liteal, and the intended concatanation was done in Phase 6
"adjacent string literal tokens are concatenated", after the macro expansion.

Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com
Task-number: QTBUG-22847

10 years agoAdd spaces for string concatenation to work around C++11 source incompatibility.
hjk [Tue, 22 Nov 2011 13:49:57 +0000 (14:49 +0100)]
Add spaces for string concatenation to work around C++11 source incompatibility.

Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Task-number: QTBUG-22847

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 scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Tue, 22 Nov 2011 06:41:35 +0000 (16:41 +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:
  First batch of French translations updates

10 years agoFirst batch of French translations updates
Pierre Rossi [Thu, 17 Nov 2011 15:15:16 +0000 (16:15 +0100)]
First batch of French translations updates

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Mon, 21 Nov 2011 18:22:35 +0000 (04:22 +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:
  Add spaces for string concatenation to work around C++11 source incompatibility.

10 years agoAdd spaces for string concatenation to work around C++11 source incompatibility.
hjk [Mon, 21 Nov 2011 17:53:16 +0000 (18:53 +0100)]
Add spaces for string concatenation to work around C++11 source incompatibility.

Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Task-number: QTBUG-22847

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 agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Fri, 18 Nov 2011 17:21:11 +0000 (03:21 +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:
  Fix sporadic hang in QLocalServer::close() in OS X 10.7
  Qt Linguist: Fix crash after select 2nd translation in lengthvariant

10 years agoFix sporadic hang in QLocalServer::close() in OS X 10.7
Robert Knight [Fri, 18 Nov 2011 17:07:21 +0000 (18:07 +0100)]
Fix sporadic hang in QLocalServer::close() in OS X 10.7

There is a bug in CFSocket/CFRunLoopSource in OS X 10.7 which can lead to a deadlock
in CFRunLoopRemoveSource or CFRunLoopSourceInvalidate if the CFSocket manager thread
is concurrently calling CFSocketInvalidate as a result of the socket's file descriptor
having been closed.

QLocalServer::close() triggers this race by closing the socket fd before unregistering
the QSocketNotifier, which internally uses CFSocket.

This commit fixes the problem by changing the ordering in close() so that the socket notifier
is disabled before closing the file descriptor.  This change also makes QLocalServer::close()
perform operations in reverse order to QLocalServer::listen(), as would be expected.

Task-number: QTBUG-22789
Merge-request: 1470
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
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 agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Thu, 17 Nov 2011 19:28:59 +0000 (05:28 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
  Allow setting the runtime graphicssystem via QT_DEFAULT_RUNTIME_SYSTEM.
  Partially revert "Set the graphics system name in the graphics system factory."

10 years agoQt Linguist: Fix crash after select 2nd translation in lengthvariant
Takumi ASAKI [Thu, 17 Nov 2011 15:26:05 +0000 (16:26 +0100)]
Qt Linguist: Fix crash after select 2nd translation in lengthvariant

* MessageEditor keeps deleted editor as m_selectionHolder.

QOjbect::destroyed() SIGNAL doesn't fit to fix this problem
due to destruction order problem.

Merge-request: 1466
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
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 branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Thu, 17 Nov 2011 14:55:53 +0000 (00:55 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
  Minor improvements to whatlog generation in Symbian tools2 builds.
  Fix linux-symbian cross-compilation configure-phase for platform builing

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 git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Wed, 16 Nov 2011 11:20:22 +0000 (21:20 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
  Allow setting the runtime graphicssystem via QT_DEFAULT_RUNTIME_SYSTEM.
  Partially revert "Set the graphics system name in the graphics system factory."

10 years agoAllow setting the runtime graphicssystem via QT_DEFAULT_RUNTIME_SYSTEM.
Robin Burchell [Wed, 16 Nov 2011 11:17:05 +0000 (12:17 +0100)]
Allow setting the runtime graphicssystem via QT_DEFAULT_RUNTIME_SYSTEM.

This is useful on some SGX boards, where each GL context locks a huge chunk into
RAM, but we don't want to set the default runtime system to 'meego' as this
requires certain EGL extensions.

Merge-request: 2718
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>