qt:qt.git
10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Mon, 28 Nov 2011 12:11:25 +0000 (22:11 +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: (169 commits)
  Added missing license header.
  Adjust pathes once again.
  Fixed a link
  Fixed a link
  Split behavior and wigglytext examples
  Rename files to show up in docs.
  Whitespace changes and added depends.
  Fix up examples.
  Fixed some linking issues.
  Removed unecessary files from folders.
  Fixes for the manifest and links.
  Changed some of the short descriptions for WebView examples.
  Removed unecessary duplicate files.
  Symbian-linux crosscompilation case changes
  Fix link to WebView examples.
  Fix link to ListView and WebView example pages.
  Fixed lists to be ordered lists and added curly brackets
  Change the links to behavior examples.
  Fix warning about unbalanced parantheses.
  Fix abstractitemmodel compilation error.
  ...

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
Qt Continuous Integration System [Sat, 26 Nov 2011 19:08:45 +0000 (05:08 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
  Doc: Fixing typo

10 years agoMerge remote-tracking branch 'qt-qa-review/master'
Sergio Ahumada [Sat, 26 Nov 2011 18:55:41 +0000 (19:55 +0100)]
Merge remote-tracking branch 'qt-qa-review/master'

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Fri, 25 Nov 2011 23:25:20 +0000 (09:25 +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:
  Symbian-linux crosscompilation case changes
  Symbian-linux crosscompilation debug-release align

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Fri, 25 Nov 2011 10:08:07 +0000 (20:08 +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: (23 commits)
  Added missing license header.
  Adjust pathes once again.
  Fixed a link
  Fixed a link
  Split behavior and wigglytext examples
  Rename files to show up in docs.
  Whitespace changes and added depends.
  Fix up examples.
  Fixed some linking issues.
  Removed unecessary files from folders.
  Fixes for the manifest and links.
  Changed some of the short descriptions for WebView examples.
  Removed unecessary duplicate files.
  Fix link to WebView examples.
  Fix link to ListView and WebView example pages.
  Fixed lists to be ordered lists and added curly brackets
  Change the links to behavior examples.
  Fix warning about unbalanced parantheses.
  Fix abstractitemmodel compilation error.
  Split ListView and WebView examples.
  ...

10 years agoAdded missing license header.
Rohan McGovern [Fri, 25 Nov 2011 02:14:23 +0000 (12:14 +1000)]
Added missing license header.

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Thu, 24 Nov 2011 21:07:05 +0000 (07:07 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
  Symbian-linux crosscompilation case changes

10 years agoAdjust pathes once again.
Daniel Molkentin [Thu, 24 Nov 2011 17:22:05 +0000 (18:22 +0100)]
Adjust pathes once again.

Reviewed-by: trustme
10 years agoFixed a link
Kevin Wright [Thu, 24 Nov 2011 17:05:28 +0000 (18:05 +0100)]
Fixed a link

10 years agoFixed a link
Kevin Wright [Thu, 24 Nov 2011 17:03:27 +0000 (18:03 +0100)]
Fixed a link

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging
Kevin Wright [Thu, 24 Nov 2011 17:01:15 +0000 (18:01 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging

10 years ago Split behavior and wigglytext examples
Kevin Wright [Thu, 24 Nov 2011 17:00:38 +0000 (18:00 +0100)]
 Split behavior and wigglytext examples

10 years agoRename files to show up in docs.
Casper van Donderen [Thu, 24 Nov 2011 16:51:49 +0000 (17:51 +0100)]
Rename files to show up in docs.

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging
Kevin Wright [Thu, 24 Nov 2011 16:31:36 +0000 (17:31 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging

10 years agoWhitespace changes and added depends.
Kevin Wright [Thu, 24 Nov 2011 16:31:01 +0000 (17:31 +0100)]
Whitespace changes and added depends.

10 years agoFix up examples.
Daniel Molkentin [Thu, 24 Nov 2011 16:13:34 +0000 (17:13 +0100)]
Fix up examples.

- Remove dependencies from examples
- Remove stray copies of qtc_packaging
- remove .desktop files
- rename examples (to their old name)

Reviewed-By: Casper van Donderen
10 years agoFixed some linking issues.
Kevin Wright [Thu, 24 Nov 2011 16:27:09 +0000 (17:27 +0100)]
Fixed some linking issues.

10 years agoRemoved unecessary files from folders.
Kevin Wright [Thu, 24 Nov 2011 16:21:17 +0000 (17:21 +0100)]
Removed unecessary files from folders.

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging
Casper van Donderen [Thu, 24 Nov 2011 16:13:27 +0000 (17:13 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging

10 years agoFixes for the manifest and links.
Casper van Donderen [Thu, 24 Nov 2011 16:13:05 +0000 (17:13 +0100)]
Fixes for the manifest and links.

10 years agoChanged some of the short descriptions for WebView examples.
Kevin Wright [Thu, 24 Nov 2011 16:06:18 +0000 (17:06 +0100)]
Changed some of the short descriptions for WebView examples.

10 years agoRemoved unecessary duplicate files.
Kevin Wright [Thu, 24 Nov 2011 16:03:10 +0000 (17:03 +0100)]
Removed unecessary duplicate files.

10 years agoSymbian-linux crosscompilation case changes
Pasi Pentikainen [Thu, 24 Nov 2011 15:47:52 +0000 (17:47 +0200)]
Symbian-linux crosscompilation case changes

Update the cases to match actual files in Symbian, and add EPOCROOT
prefixes to data files in iby.

Reviewed-by: Juha Kukkonen
Task-number: QTBUG-14361

10 years agoFix link to WebView examples.
Casper van Donderen [Thu, 24 Nov 2011 15:47:34 +0000 (16:47 +0100)]
Fix link to WebView examples.

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Thu, 24 Nov 2011 15:45:21 +0000 (01:45 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
  Symbian-linux crosscompilation debug-release align

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging
Casper van Donderen [Thu, 24 Nov 2011 15:39:07 +0000 (16:39 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging

10 years agoFix link to ListView and WebView example pages.
Casper van Donderen [Thu, 24 Nov 2011 15:38:48 +0000 (16:38 +0100)]
Fix link to ListView and WebView example pages.

10 years agoFixed lists to be ordered lists and added curly brackets
Kevin Wright [Thu, 24 Nov 2011 15:34:39 +0000 (16:34 +0100)]
Fixed lists to be ordered lists and added curly brackets

10 years agoChange the links to behavior examples.
Casper van Donderen [Thu, 24 Nov 2011 15:27:33 +0000 (16:27 +0100)]
Change the links to behavior examples.

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging
Kevin Wright [Thu, 24 Nov 2011 15:24:00 +0000 (16:24 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging

10 years agoFix warning about unbalanced parantheses.
Daniel Molkentin [Thu, 24 Nov 2011 14:13:21 +0000 (15:13 +0100)]
Fix warning about unbalanced parantheses.

Reviewed-By: Robert Loehning
10 years agoFix abstractitemmodel compilation error.
Daniel Molkentin [Thu, 24 Nov 2011 11:14:19 +0000 (12:14 +0100)]
Fix abstractitemmodel compilation error.

10 years agoSplit ListView and WebView examples.
Kevin Wright [Thu, 24 Nov 2011 15:23:04 +0000 (16:23 +0100)]
Split ListView and WebView examples.

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 agoSymbian-linux crosscompilation debug-release align
Pasi Pentikainen [Thu, 24 Nov 2011 14:44:32 +0000 (16:44 +0200)]
Symbian-linux crosscompilation debug-release align

Change the Symbian Raptor configure options to use debug variant when
using configure-sh on linux crosscompilation, so that it matches with
result of configure.exe on windows.

Reviewed-by: Miikka Heikkinen
Task-number: QTBUG-14361

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 agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Thu, 24 Nov 2011 09:19:07 +0000 (19:19 +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:
  Fix Linux-Symbian parallel cross-compilation configure step
  Symbian: don't merge native clipboard, overwrite.
  Surviving out of memory in Qt Quick app
  Export QtGui functions required by QtMultimediaKit backend
  fix bearer crash
  Fix alignment of non-wrapped richtext QML Text elements.

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 agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Wed, 23 Nov 2011 19:44:27 +0000 (05:44 +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:
  Fix build error: specifying full path to pro file is required here.

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 agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Wed, 23 Nov 2011 14:34:53 +0000 (00: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:
  Fix manifest install rule on windows

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Wed, 23 Nov 2011 14:18:30 +0000 (00:18 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
  Fix Linux-Symbian parallel cross-compilation configure step

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 agoFix Linux-Symbian parallel cross-compilation configure step
Pasi Pentikainen [Tue, 22 Nov 2011 15:08:48 +0000 (17:08 +0200)]
Fix Linux-Symbian parallel cross-compilation configure step

The qtconfig.flm is mostly rewritten to support parallel Raptor
Linux-Symbian cross-compilation.

Reviewed-by: Miikka Heikkinen
Done-with: Samu Sillanpaa
Task-number: QTBUG-14361

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
Qt Continuous Integration System [Wed, 23 Nov 2011 10:06:53 +0000 (20:06 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
  Sequential reading not supported.
  DeclarativeDebugServer: Instantiate QPluginLoader on heap
  Fix failing unit tests.
  qmlplugindump: Fix dumping empty names for generated QMetaObjects.
  Fix compile with -qtnamespace
  Properly protect access to pixmap reader thread with mutex
  Move tga support from Qt3d to Qt.
  Move tga support from Qt3d to Qt.
  Properly protect access to pixmap reader thread with mutex
  qmlplugindump: Add flush to fix output redirection on windows.

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Wed, 23 Nov 2011 06:03:17 +0000 (16:03 +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:
  QNetworkProxy documentation: mention usage of "http_proxy" variable

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 agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Tue, 22 Nov 2011 15:23:52 +0000 (01:23 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
  Symbian: don't merge native clipboard, overwrite.

10 years agoSymbian: don't merge native clipboard, overwrite.
Shane Kearns [Tue, 22 Nov 2011 14:19:27 +0000 (14:19 +0000)]
Symbian: don't merge native clipboard, overwrite.

If copying text from a Qt application that has both plaintext and
formatted text representations, then S60 applications only see the
plaintext.
If copying data from an S60 application, the Qt application can see
the plaintext. However as this was merged with the existing clipboard
contents in Qt, the formatted text was unchanged.
Now, we clear the internal clipboard QMimeData before writing the
contents of the symbian clipboard to it. This ensures stale data
from a previous copy is not left behind.

Task-Number: ou1cimx1#927246
Reviewed-By: mread
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 agoQNetworkProxy documentation: mention usage of "http_proxy" variable
Peter Hartmann [Mon, 21 Nov 2011 15:07:24 +0000 (16:07 +0100)]
QNetworkProxy documentation: mention usage of "http_proxy" variable

This is done on systems other than Windows or Mac.

Change-Id: I631ea350cb9bc123edc6df33b6f661afa8f0778b
Reviewed-by: Arvid Picciani
(cherry picked from commit ac22fa8a33472cbdd85ef312c436442a93959ab3)

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 agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Tue, 22 Nov 2011 10:05:03 +0000 (20:05 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (106 commits)
  Surviving out of memory in Qt Quick app
  Export QtGui functions required by QtMultimediaKit backend
  fix bearer crash
  Rebuild configure.exe with support for MinGW 4.6
  Windows: Add gcc 4.6.
  Fix alignment of non-wrapped richtext QML Text elements.
  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.
  ...

10 years agoMerge remote-tracking branch 'qt-qml-review/master' into master-qml-staging
Kai Koehne [Tue, 22 Nov 2011 09:28:25 +0000 (10:28 +0100)]
Merge remote-tracking branch 'qt-qml-review/master' into master-qml-staging

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 agoSurviving out of memory in Qt Quick app
mread [Fri, 18 Nov 2011 16:21:07 +0000 (16:21 +0000)]
Surviving out of memory in Qt Quick app

The QtQuickPlayground app contains a version of samegame which allow
the user to edit the code. By setting the ball size to 8, the app can
run out of memory. This leaves it in a pretty bad state. But apps
on Symbian shouldn't crash due to OOM and should allow some operation.

This change fixes the immediate OOM crashes in declarative, gui and
corelib. It shows warning dialogs which explain what has gone wrong and
leaves the app in a state that can be exited cleanly
from the Symbian task list.

Task-number: QT-5319
Reviewed-by: Shane Kearns
Reviewed-by: Gareth Stockwell
Reviewed-by: Martin Jones
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 agoExport QtGui functions required by QtMultimediaKit backend
Gareth Stockwell [Fri, 18 Nov 2011 12:07:08 +0000 (12:07 +0000)]
Export QtGui functions required by QtMultimediaKit backend

In order for video rendering to work, the Symbian QtMultimediaKit
backend needs access to QtGui functionality which is not exposed
via public interfaces, namely:
* QSymbianControl::setIgnoreFocusChanged(bool)
* Setting custom painting modes, which control how content is
  blitted from the backing store into the native window surface
* Requesting notification when Qt drawing starts and stops, so
  that the backend can ensure this does not interfere with video
  rendering.

Until now, this has been achieved by the backend including private
QtGui headers.  If these headers are not present in the environment
in which QtMobility is compiled, a warning is printed, telling the
user that video / viewfinder rendering will not work correctly when
the resulting binaries are installed.

This patch adds a Symbian-specific public interface to QtGui, which
exports the functionality above.

Task-number: MOBILITY-747
Reviewed-by: mread
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 agoSequential reading not supported.
Sarah Smith [Fri, 18 Nov 2011 07:18:52 +0000 (17:18 +1000)]
Sequential reading not supported.

The read from device test should be better named "read from network
device" because that is what is being tested here - so remove the tga
test data, since sequential only (devices that cannot seek) are not
supported (yet) for tga.

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 agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team
Qt Continuous Integration System [Thu, 17 Nov 2011 15:59:12 +0000 (01:59 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
  DeclarativeDebugServer: Instantiate QPluginLoader on heap
  qmlplugindump: Fix dumping empty names for generated QMetaObjects.

10 years agoDeclarativeDebugServer: Instantiate QPluginLoader on heap
Aurindam Jana [Thu, 17 Nov 2011 14:42:48 +0000 (15:42 +0100)]
DeclarativeDebugServer: Instantiate QPluginLoader on heap

The pluginloader is instantiated on heap with server as its parent
so that the connection plugin instance remains loaded in memory.
This prevents the plugin loader in QDeclarativeInspectorService
to accidentally un-load the plugin while it's in use.

Change-Id: I11c82ce595a336ba0fd1b243d23cb497fe355147
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
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>