qt:qt.git
10 years agoSet execution bits for more scripts.
Frederik Gladhorn [Tue, 29 Nov 2011 10:58:57 +0000 (11:58 +0100)]
Set execution bits for more scripts.

10 years agoSet execution bits for .test files.
Frederik Gladhorn [Fri, 25 Nov 2011 09:58:00 +0000 (10:58 +0100)]
Set execution bits for .test files.

These files turn out to be scripts.

10 years agoFix more permissions (no execute bit).
Frederik Gladhorn [Tue, 22 Nov 2011 16:14:30 +0000 (17:14 +0100)]
Fix more permissions (no execute bit).

10 years agoFix permission (no execute bit).
Frederik Gladhorn [Tue, 22 Nov 2011 15:42:49 +0000 (16:42 +0100)]
Fix permission (no execute bit).

10 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Tue, 22 Nov 2011 00:00:12 +0000 (01:00 +0100)]
Merge branch '4.8-upstream' into master-water

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 '4.8-upstream' into master-water
Water-Team [Sat, 19 Nov 2011 00:00:12 +0000 (01:00 +0100)]
Merge branch '4.8-upstream' into master-water

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 agoMerge branch '4.8-upstream' into master-water
Water-Team [Fri, 18 Nov 2011 00:00:14 +0000 (01:00 +0100)]
Merge branch '4.8-upstream' into master-water

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 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 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 '4.8-upstream' into master-water
Water-Team [Thu, 17 Nov 2011 00:00:12 +0000 (01:00 +0100)]
Merge branch '4.8-upstream' into master-water

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>
10 years agoPartially revert "Set the graphics system name in the graphics system factory."
Robin Burchell [Wed, 16 Nov 2011 11:17:04 +0000 (12:17 +0100)]
Partially revert "Set the graphics system name in the graphics system factory."

This actually breaks runtime graphicssystem in all configurations as far as I
can tell, but definitely in the following setup:
-graphicssystem runtime -runtimegraphicssystem meego

Qt creates the runtime graphicssystem, which then sees it should create a MeeGo
GS instance. This then calls qgraphicssystemfactory::create("meego"), which was
overwriting graphics_system_name (incorrectly!)

Harmattan's Qt does not do this, and thus, is able to switch graphicssystems
correctly.

This partially reverts commit b595c2fbe0fa354190b713ef09dd1f348e22e2b6.

Merge-request: 2718
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
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 '4.8-upstream' into master-water
Water-Team [Wed, 16 Nov 2011 00:00:13 +0000 (01:00 +0100)]
Merge branch '4.8-upstream' into master-water

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>
10 years agoAdd INTEGRITY gbuild.* files to qmake project.
Rolland Dudemaine [Tue, 15 Nov 2011 16:28:27 +0000 (17:28 +0100)]
Add INTEGRITY gbuild.* files to qmake project.

This allows building and debugging qmake from Qt Creator.

Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
10 years agoUse the project root from .gpj project files, instead of local path.
Rolland Dudemaine [Tue, 15 Nov 2011 16:28:26 +0000 (17:28 +0100)]
Use the project root from .gpj project files, instead of local path.

Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
10 years agoMake sure QMAKE_CXX is defined to prevent crashing on some projects.
Rolland Dudemaine [Tue, 15 Nov 2011 16:28:24 +0000 (17:28 +0100)]
Make sure QMAKE_CXX is defined to prevent crashing on some projects.

Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
10 years agoAdd support for .pro-type subdirectories.
Rolland Dudemaine [Tue, 15 Nov 2011 16:28:23 +0000 (17:28 +0100)]
Add support for .pro-type subdirectories.

Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
10 years agoAdd relative path to the work directory, to prevent filename clashes.
Rolland Dudemaine [Tue, 15 Nov 2011 16:28:22 +0000 (17:28 +0100)]
Add relative path to the work directory, to prevent filename clashes.

This was causing issues for some examples, which are all consistently
using main.cpp as the entry file.

Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
10 years agoOnly call moc if the file needs it.
Rolland Dudemaine [Tue, 15 Nov 2011 16:28:21 +0000 (17:28 +0100)]
Only call moc if the file needs it.

This applies to both headers and cpp files (use mocable()).
Previously, moc was called on all cpp and h files, causing
additional compilation time, and trouble on QSvgGenerator.

Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
10 years agoUse outname to specify the output .gpj to generate.
Rolland Dudemaine [Tue, 15 Nov 2011 16:28:19 +0000 (17:28 +0100)]
Use outname to specify the output .gpj to generate.

This resolves several path issues as well.
outname itself is now based on the first TARGET file,
instead of using the output filename.

Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
10 years agoUse "dll" instead of "shared".
Rolland Dudemaine [Tue, 15 Nov 2011 16:28:18 +0000 (17:28 +0100)]
Use "dll" instead of "shared".

For DLLs (which are not supported, but may be soon), use
the CONFIG variable "dll" instead of the "shared" template,
because some testcases actually use shared even when
compiled statically.

Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
10 years agoInstead of translating / into _, check if subdir is a .pro.
Rolland Dudemaine [Tue, 15 Nov 2011 16:28:17 +0000 (17:28 +0100)]
Instead of translating / into _, check if subdir is a .pro.

Previously, .pro files were treated as directories, and a previous
workaround for the issue was to replace / with _ in directory paths.
This was both actually non-sensical and not effective.
This resolves the issue by checking if the subdir has a .pro extension.

Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
10 years agoDo not generate -D defines for project types.
Rolland Dudemaine [Tue, 15 Nov 2011 16:28:16 +0000 (17:28 +0100)]
Do not generate -D defines for project types.

Options are implicitly inherited from project to subprojects
and applications, so there is no need to respecify them.
Worse, if an app/lib disables an option, the project might
still have the define enabled, forcing it also onto the app/lib.
This prevents double-define or this kind of conflict.

Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
10 years agoClean up generated linker file for the shared library case.
Rolland Dudemaine [Tue, 15 Nov 2011 16:28:14 +0000 (17:28 +0100)]
Clean up generated linker file for the shared library case.

Generated linker file was not looking good, now much better.

Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
10 years agoMake applications start by default (StartIt True).
Rolland Dudemaine [Tue, 15 Nov 2011 16:28:13 +0000 (17:28 +0100)]
Make applications start by default (StartIt True).

Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
10 years agoChange the overload from write() to writeMakefile() in INTEGRITY generator
Rolland Dudemaine [Tue, 15 Nov 2011 16:28:12 +0000 (17:28 +0100)]
Change the overload from write() to writeMakefile() in INTEGRITY generator

This way, INTEGRITY-specific generation is only called in
Makefile mode.

Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
10 years agoResolve atomic operations issues on INTEGRITY.
Rolland Dudemaine [Tue, 15 Nov 2011 16:28:11 +0000 (17:28 +0100)]
Resolve atomic operations issues on INTEGRITY.

Now passes atomicpointer autotest successfully.

Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
10 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Tue, 15 Nov 2011 16:06:20 +0000 (02:06 +1000)]
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  tests: allow unstable tests to be marked with CONFIG+=insignificant_test
  Fix focusScopeItemChange setting crash
  Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd
  symbian - handle path being passed as part of filename in QTranslator
  Symbian - fix compile error when default configured
  Compile when -no-rtti is specified as a configure option
  Ensure that the RC_FILE is correctly handled in a single configuration

10 years agoMerge branch 4.7 into qt-4.8-from-4.7
Sergio Ahumada [Tue, 15 Nov 2011 15:32:31 +0000 (16:32 +0100)]
Merge branch 4.7 into qt-4.8-from-4.7

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Tue, 15 Nov 2011 15:13:08 +0000 (01:13 +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:
  Minor improvements to whatlog generation in Symbian tools2 builds.

10 years agoMinor improvements to whatlog generation in Symbian tools2 builds.
Miikka Heikkinen [Tue, 15 Nov 2011 13:29:21 +0000 (15:29 +0200)]
Minor improvements to whatlog generation in Symbian tools2 builds.

- Generate temporary whatlog file under epoc32/build rather than the
  source directory.

- Remove depenedency to qmake building from WHAT target to ensure
  nothing is built if "sbs -c tools2 --what" command is issued as that
  is supposed to just list what was built.

Reviewed-by: Sami Merila
10 years agoAdd the ability to do unsafe SSL renegotiation as a fallback.
Richard Moore [Mon, 14 Nov 2011 21:56:40 +0000 (21:56 +0000)]
Add the ability to do unsafe SSL renegotiation as a fallback.

This commit adds the ability to perform legacy SSL renegotiation as
a fallback via QSsl::SslOptions. This is something that used to work,
but has been disabled by default in newer versions of openssl. The
need for this has been reported by users (eg. in QTBUG-14983).

Change-Id: I5b80f3ffd07e0c5faddc469f6a8f857bac5740f7
Reviewed-by: Corentin Chary <corentin.chary@gmail.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
(cherry picked from commit 75b2a4960b753766ea2eec4dbd34c67733ca8089)

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Tue, 15 Nov 2011 11:33:51 +0000 (21:33 +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:
  Properly protect access to pixmap reader thread with mutex

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging into 4.7-integration
Qt Continuous Integration System [Tue, 15 Nov 2011 09:23:02 +0000 (19:23 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
  tests: allow unstable tests to be marked with CONFIG+=insignificant_test

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Tue, 15 Nov 2011 09:16:23 +0000 (19:16 +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 cross-compilation configure-phase for platform builing

10 years agotests: allow unstable tests to be marked with CONFIG+=insignificant_test
Rohan McGovern [Thu, 19 May 2011 01:42:31 +0000 (11:42 +1000)]
tests: allow unstable tests to be marked with CONFIG+=insignificant_test

Marking a test with CONFIG+=insignificant_test will cause the exit code
of the test to be discarded during `make check'.  This is intended to be
used for tests which are valuable to run, but are known to be unstable
and are not feasible to immediately fix.

Reviewed-by: Jason McDonald
Change-Id: I50a712c33c2ebb0af39f1ea0bf2adef7f0936425
(cherry picked from commit b0a5a988900b777cb08012408eb108512a3e873b)

10 years agoProperly protect access to pixmap reader thread with mutex
Chris Adams [Mon, 14 Nov 2011 01:57:21 +0000 (11:57 +1000)]
Properly protect access to pixmap reader thread with mutex

Previously, access to the data from the reader thread wasn't guarded
properly, causing a crash when the reader thread was deleted prior to
QDeclarativePixmapData (which then attempted to dereference the
thread pointer to cancel the request), or in the case where a
QDeclarativePixmapData was deleted after its QDeclarativePixmapReply
was removed from the jobs queue but prior to processing.

Reviewed-by: Martin Jones
Task-number: QTBUG-22125

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 07:16:28 +0000 (17:16 +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:
  Revert "Improved performance of mapFromGlobal/mapToGlobal on X11"
  Fix QDockWidget titlebar button positioning on Mac OS X
  Fixed memory leak in Windows Vista style widgets

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Tue, 15 Nov 2011 05:34:48 +0000 (15:34 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Fix focusScopeItemChange setting crash

10 years agoFix focusScopeItemChange setting crash
Damian Jansen [Tue, 15 Nov 2011 04:01:13 +0000 (14:01 +1000)]
Fix focusScopeItemChange setting crash

Delay focusScopeItemChange to after reparenting, to prevent
an invalid focusScopeItem pointer crash.

Task-number: QTBUG-21640
Reviewed-by: Martin Jones
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Tue, 15 Nov 2011 02:25:58 +0000 (12:25 +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:
  Update the supported platforms page.
  Increase qdoc3 stack size when using MSVC to 4M.

10 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Tue, 15 Nov 2011 00:00:13 +0000 (01:00 +0100)]
Merge branch '4.8-upstream' into master-water

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Mon, 14 Nov 2011 21:39:23 +0000 (07:39 +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:
  network auto tests: add QNetworkReply test for pipelining
  HTTP: blacklist server for pipelining

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Mon, 14 Nov 2011 17:42:13 +0000 (03:42 +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:
  Remove font that may not exists in some OS X systems
  Fix regression in styleName searching
  Fix styleName listing with the same QtFontStyle::Key value
  Fix localized font family access in OS X

10 years agonetwork auto tests: add QNetworkReply test for pipelining
Peter Hartmann [Mon, 14 Nov 2011 16:11:00 +0000 (17:11 +0100)]
network auto tests: add QNetworkReply test for pipelining

Reviewed-by: Markus Goetz
Task-number: QTBUG-21369

10 years agoHTTP: blacklist server for pipelining
Peter Hartmann [Mon, 14 Nov 2011 15:21:38 +0000 (16:21 +0100)]
HTTP: blacklist server for pipelining

that server was found out not to support HTTP pipelining.

tested manually; for more information see the task.

Reviewed-by: Markus Goetz
Task-number: QTBUG-21369

10 years agoRevert "Improved performance of mapFromGlobal/mapToGlobal on X11"
Friedemann Kleint [Mon, 14 Nov 2011 15:26:15 +0000 (16:26 +0100)]
Revert "Improved performance of mapFromGlobal/mapToGlobal on X11"

The change introduces problems with Unity's global menu bar.

Task-number: QTBUG-22420

Reviewed-by: denis <denis.dzyubenko@nokia.com>
This reverts commit cdd776a91e65bf5c30cea1bab9823134a3f797d0.

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Mon, 14 Nov 2011 15:12:16 +0000 (01:12 +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: (40 commits)
  Fix for QMessageBox's autotest.
  Fix for the button size calculation in qmessagebox.cpp
  Fixed wrong QGroupBox check state
  Added base 10 to be used with QIntValidator.
  Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd
  Mac: Fix the color of check marks in menus with stylesheet
  Fix warning when using QXmlInputSource with non opened QIODevice
  HTTP proxy engine - accept standard Connection header
  Russian translation update
  Don't directly access QList contents
  Fix QPlainTextEdit when using Qt::TextSelectableByKeyboard flag
  Fix QDateEdit calendar pop-up having wrong date
  Repaint QProgressBar when minimum or maximum changed
  Fix QProgressBar causing timer event spam
  Fix memory leak in QCursorData
  fix gdb_dwarf_index.prf for applications, take two
  Compile fix for Mac OS X 10.7 with 10.6 sdk
  Update supported platforms and remove commercial page.
  networking: regenerate effective TLD table for cookies
  fix gdb_dwarf_index.prf for executables
  ...

10 years agoMerge remote-tracking branch 'qt-mainline/4.8'
aavit [Mon, 14 Nov 2011 15:10:54 +0000 (16:10 +0100)]
Merge remote-tracking branch 'qt-mainline/4.8'

10 years agoFix linux-symbian cross-compilation configure-phase for platform builing
Pasi Pentikainen [Sat, 12 Nov 2011 23:58:26 +0000 (01:58 +0200)]
Fix linux-symbian cross-compilation configure-phase for platform builing

When building Symbian platform itself, the lower layer libraries are not
available on configure phase, and the config.test build scripts fail,
creating false "NO"-flags (also config.test currently does not work with
Symbian raptor). This fix aligns the configure results of configure-sh-
script with configure.exe as far as possible and fixes couple of symbian
cross-compilation configure issues, as detailed below:

Configure sh-script:
- Disable configure tests with symbian-sbsv2 where the failing test
  would result to invalid disable-flags
- Skip applying of X11/Unix/Mac specific QCONFIG disable-flags that
  are not produced by configure.exe either
- Fix emitting of "QT_NO_GUI" flag (in all environments)

qtconfigure.flm:
- Copy mkspecs as files to /epoc32/... instead of symbolic link

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

10 years agoFix QDockWidget titlebar button positioning on Mac OS X
Pasi Matilainen [Mon, 14 Nov 2011 14:39:25 +0000 (15:39 +0100)]
Fix QDockWidget titlebar button positioning on Mac OS X

Move the QDockWidget close and float buttons from the right end of the
dock widget title bar to the left end to avoid Mac App Store rejection.

Task-number: QTBUG-19493

Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
10 years agoFixed memory leak in Windows Vista style widgets
Tero Ahola [Mon, 14 Nov 2011 14:27:01 +0000 (15:27 +0100)]
Fixed memory leak in Windows Vista style widgets

The animations are now deleted in destruction of the Vista style.
With the previous implementation the animations were not deleted for
instance if you move mouse cursor off from a widget with hover
animation (like QPushButton).

Task-number: QTBUG-21532

Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
10 years agoUpdate the supported platforms page.
Casper van Donderen [Mon, 14 Nov 2011 14:00:55 +0000 (15:00 +0100)]
Update the supported platforms page.

Windows XP, Win7 32-bit and Mac 106 Cocoa were missing from the
supported platforms table.

10 years agoIncrease qdoc3 stack size when using MSVC to 4M.
Casper van Donderen [Mon, 14 Nov 2011 12:18:07 +0000 (13:18 +0100)]
Increase qdoc3 stack size when using MSVC to 4M.

When running 'make docs' on Win7 with MSVC2010 64bit debug qdoc will
crash from a stack overflow. The stack overflow occurs when sorting the
list of nodes in the internal qdoc tree.

This patch circumvents the stack overflow crash by increasing the stack
size from the standard 1M to 4M.

Reviewed-by: Friedemann Kleint
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Mon, 14 Nov 2011 09:34:38 +0000 (19:34 +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 for QMessageBox's autotest.
  Fix for the button size calculation in qmessagebox.cpp

10 years agoFix for QMessageBox's autotest.
Mikko Knuutila [Mon, 14 Nov 2011 09:18:22 +0000 (10:18 +0100)]
Fix for QMessageBox's autotest.

Mnemonic shortcut caused string comparison to fail.

Task-number: QTBUG-22119

Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
10 years agoFix for the button size calculation in qmessagebox.cpp
Mikko Knuutila [Mon, 14 Nov 2011 09:18:21 +0000 (10:18 +0100)]
Fix for the button size calculation in qmessagebox.cpp

Actually use the calculated size for needed space instead of just
ignoring the return value.

Task-number: QTBUG-16315

Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Sun, 13 Nov 2011 12:31:13 +0000 (22:31 +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:
  Remove font that may not exists in some OS X systems

10 years agoRemove font that may not exists in some OS X systems
Jiang Jiang [Sun, 13 Nov 2011 12:29:38 +0000 (13:29 +0100)]
Remove font that may not exists in some OS X systems

10 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Sun, 13 Nov 2011 00:00:12 +0000 (01:00 +0100)]
Merge branch '4.8-upstream' into master-water

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Sat, 12 Nov 2011 18:03:55 +0000 (04:03 +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:
  Fixed wrong QGroupBox check state
  Added base 10 to be used with QIntValidator.
  Mac: Fix the color of check marks in menus with stylesheet
  Russian translation update
  Don't directly access QList contents
  Fix QPlainTextEdit when using Qt::TextSelectableByKeyboard flag

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration
Qt Continuous Integration System [Sat, 12 Nov 2011 09:40:38 +0000 (19:40 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
  Re-apply change e3208a8d44423bc3b5c32e2e90f68675e51a3b73 by Andreas Kling
  Re-apply change 37cde52cb17b57f8ec89c248f06331ed4977e51c by Ademar de Souza Reis Jr
  Re-apply change 945c44d0865cf44363e6c860995f971ce952dd5f by Ademar de Souza Reis Jr
  Updated WebKit to 52a11cec052aa40d3bbc06861be1177b649b4a99

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Sat, 12 Nov 2011 01:43:06 +0000 (11: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:
  Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd
  Fix warning when using QXmlInputSource with non opened QIODevice
  HTTP proxy engine - accept standard Connection header

10 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Sat, 12 Nov 2011 00:00:13 +0000 (01:00 +0100)]
Merge branch '4.8-upstream' into master-water

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Fri, 11 Nov 2011 17:53:07 +0000 (03:53 +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:
  Update supported platforms and remove commercial page.
  qdoc3: Replace %REPLACEME% with the correct path

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Fri, 11 Nov 2011 13:48:47 +0000 (23:48 +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 memory leak in QCursorData
  Create cleanup stack in idleDetectorThread

10 years agoFixed wrong QGroupBox check state
Markku Heikkila [Fri, 11 Nov 2011 13:35:23 +0000 (14:35 +0100)]
Fixed wrong QGroupBox check state

Handle mouserelease only if mouse is pressed in QGroupBox.

Task-number: QTBUG-19170

Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
10 years agoAdded base 10 to be used with QIntValidator.
Mikko Knuutila [Fri, 11 Nov 2011 13:15:29 +0000 (14:15 +0100)]
Added base 10 to be used with QIntValidator.

Fixes an error in QIntValidator, which occurred because
locale.toInt() was missing a parameter for base value and this
led it to presume wrongly that a base 8 is in use.

Task-number: QTBUG-21602

Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Fri, 11 Nov 2011 12:39:08 +0000 (22:39 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd

10 years agoFix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd
Sami Rosendahl [Fri, 11 Nov 2011 12:29:38 +0000 (13:29 +0100)]
Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd

If a HTTP server responds with gzip-encoded empty content without defining
Content-Length in the response header QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd
will crash because it calls zlib inflateEnd for an uninitialized stream.

- Fixed the crash by adding a check if the stream is initialized to gunzipBodyPartiallyEnd.
- Added a regression test tst_QNetworkReply::nb279420gzipNoContentLengthEmptyContentDisconnect

PMO 279420
Task-number: QTBUG-22660

Signed-off-by: Sami Rosendahl <sami.rosendahl@reaktor.fi>
Merge-request: 1465
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
10 years agoFix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd
Sami Rosendahl [Fri, 11 Nov 2011 12:17:54 +0000 (13:17 +0100)]
Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd

If a HTTP server responds with gzip-encoded empty content without defining
Content-Length in the response header QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd
will crash because it calls zlib inflateEnd for an uninitialized stream.

- Fixed the crash by adding a check if the stream is initialized to gunzipBodyPartiallyEnd.
- Added a regression test tst_QNetworkReply::nb279420gzipNoContentLengthEmptyContentDisconnect

PMO 279420
Task-number: QTBUG-22660

Signed-off-by: Sami Rosendahl <sami.rosendahl@reaktor.fi>
Merge-request: 1465
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
10 years agoMac: Fix the color of check marks in menus with stylesheet
Tero Ahola [Fri, 11 Nov 2011 12:03:02 +0000 (13:03 +0100)]
Mac: Fix the color of check marks in menus with stylesheet

Task-number: QTBUG-16989

Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Morten Johan Sorvig <morten.sorvig@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
10 years agoFix warning when using QXmlInputSource with non opened QIODevice
Shane Kearns [Thu, 10 Nov 2011 17:16:25 +0000 (17:16 +0000)]
Fix warning when using QXmlInputSource with non opened QIODevice

Calling setTextModeEnabled on a QIODevice that is not open generates
a warning as a result of QTBUG-20905. Previously, it caused incorrect
behaviour when called with true.
Now only call it if the QIODevice passed in is already opened.
If not open, then it is opened by the xml reader without text mode,
so there is no difference in behaviour.

xml autotests still pass, although this removes several QWARN messages
from the qdom autotest.

Task-number: QTBUG-22659
Change-Id: Ie3137e44fe776bff6371ebd008428110168717ec
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
(cherry picked from commit d457f148cf1efbea3db5fdc87c418cc9647e2baf)

10 years agoHTTP proxy engine - accept standard Connection header
Shane Kearns [Wed, 26 Oct 2011 13:45:50 +0000 (14:45 +0100)]
HTTP proxy engine - accept standard Connection header

The Proxy-Connection header is a non standard header, but is widely
used so forming a de-facto standard.
Some proxies use the official Connection header, so we should check
for that in responses. Otherwise https connections over http proxy
fail in case the proxy sends "Connection: close" with the 407 reply.

Task-number: QTBUG-22177
Change-Id: If6cfa4ebb7ac9d97d65b6ddcc8257aee20ac0448
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
(cherry picked from commit 0ad18e18d1223b173d4a0d374b70ec08c3b22b11)

10 years agoRussian translation update
Sergey Belyashov [Fri, 11 Nov 2011 11:27:43 +0000 (12:27 +0100)]
Russian translation update

Merge-request: 2715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
10 years agoDon't directly access QList contents
Alberto Mardegan [Fri, 11 Nov 2011 11:10:22 +0000 (12:10 +0100)]
Don't directly access QList contents

The existing code doesn't work on 64bit machines. We must first convert
the list into a QVector, which guarantees that elements are laid out
correctly as an array.

Merge-request: 1467
Reviewed-by: thiago