qt:qt.git
10 years agoRe-apply change a14033620fab5edca44293ec6dfcc904e2e0eb20 by Andreas Kling
Andreas Kling [Thu, 22 Sep 2011 12:48:44 +0000 (14:48 +0200)]
Re-apply change a14033620fab5edca44293ec6dfcc904e2e0eb20 by Andreas Kling

Sentences should end with a period! (Poor man's rebuild trigger.)

10 years agoRe-apply change 3489808c1dcd157ac09dd6da16bc057b56696d59 by Ademar de Souza Reis Jr
Ademar de Souza Reis Jr [Tue, 20 Sep 2011 14:12:04 +0000 (11:12 -0300)]
Re-apply change 3489808c1dcd157ac09dd6da16bc057b56696d59 by Ademar de Souza Reis Jr

Workaround MSVC2010 problems when linking QtWebKit
Include MSVC2010 in the list of compilers where incremental
build is disabled (INCREMENTAL:NO).

Change suggested by Simo Falt <simo.falt@nokia.com>

10 years agoRe-apply change 3dd9e66baaa0848bcc2eb7daecf2b63724624358 by Ademar de Souza Reis Jr
Ademar de Souza Reis Jr [Mon, 19 Sep 2011 13:43:14 +0000 (10:43 -0300)]
Re-apply change 3dd9e66baaa0848bcc2eb7daecf2b63724624358 by Ademar de Souza Reis Jr

dos2unix on a webkit source file (fix support for Visual Studio)
webkit/Source/WebCore/bindings/js/JSExceptionBase.h had CRLF
terminations, which Visual Studio didn't like for some reason.

Reported by Simo Falt. Patch is also being submited to upstream
(webkit.org)

10 years agoUpdated WebKit to 99371ddc1d61832131835964a753e1c5817f6916
Zeno Albisser [Thu, 3 Nov 2011 16:13:03 +0000 (17:13 +0100)]
Updated WebKit to 99371ddc1d61832131835964a753e1c5817f6916

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Tue, 27 Sep 2011 00:20:24 +0000 (10:20 +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:
  Update changes-4.8.0 file
  Only limit cursor position when line is wrapped
  Make sure cursor position doesn't exceed line end
  Allow shared EGL contexts for xcb and xlib platforms
  Allow generic EGL platform contexts to be shared
  4.8 Changes: OpenGL Framebuffer Format
  stop tslib plugin having same file name as linux input plugin
  Avoid unnecessary detach of a QImage in QPixmapDropShadowFilter

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Mon, 26 Sep 2011 18:36:02 +0000 (04:36 +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:
  Improve sbsv2 whatlog support.
  Modified SymSQL documentation in sql-driver.qdoc according review comments
  Added correct licence headers to symsql source files
  Documentation modifications for SymbianSQL added into sql-driver.qdoc
  Release Symbian SQL driver
  Fixed a typo found by static checker
  Added SQL driver plugin implementation for Symbian.
  Symbian: Fix qmdiarea autotest regressions
  Fix memory leaks in schema validation
  Symbian: Added copy-paste functionality to FEP input context
  symbian: Implement QNetworkConfiguration::purpose()
  symbian bearer: fix tst_qnetworksession test failures
  Fix the incorrect sizeHint given by QLabel on Symbian

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Mon, 26 Sep 2011 12:24:57 +0000 (22:24 +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 broken qglthreads autotest build on Solaris.
  Don't store the alignment attribute for spacers

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integ...
Qt Continuous Integration System [Sat, 24 Sep 2011 06:34:16 +0000 (16:34 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
  Fix accessible menu not returning child name.

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Fri, 23 Sep 2011 18:34:47 +0000 (04: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:
  Update changelog for Qt-4.8.0: add QtWebKit notes
  Update changelog for Qt 4.8

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Fri, 23 Sep 2011 17:08:09 +0000 (03:08 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
  Fix accessible menu not returning child name.

11 years agoFix accessible menu not returning child name.
Frederik Gladhorn [Fri, 23 Sep 2011 12:23:52 +0000 (14:23 +0200)]
Fix accessible menu not returning child name.

When accessible name is set, QAccessibleMenu would always return
the menu's name, not that of the child action.

Task-Number: QTBUG-21578
Reviewed-by: Jan-Arve
11 years agoFix broken qglthreads autotest build on Solaris.
Iikka Eklund [Fri, 23 Sep 2011 15:13:39 +0000 (17:13 +0200)]
Fix broken qglthreads autotest build on Solaris.

qglthreads autotest can not find usleep() function when
compiling on Solaris platform. Added qplatformdefs.h include
to fix compilation.

Task-number: QTBUG-21594

Merge-request: 1394
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoDon't store the alignment attribute for spacers
Jarek Kobus [Fri, 23 Sep 2011 10:19:02 +0000 (12:19 +0200)]
Don't store the alignment attribute for spacers

And for QLayoutWidget as it is not allowed and will create
a code which doesn't compile

Reviewed-by: con <qtc-committer@nokia.com>
Task-number: QTBUG-21575

11 years agoUpdate changelog for Qt-4.8.0: add QtWebKit notes
Ademar de Souza Reis Jr [Thu, 22 Sep 2011 17:35:31 +0000 (14:35 -0300)]
Update changelog for Qt-4.8.0: add QtWebKit notes

11 years agoUpdate changelog for Qt 4.8
Sinan Tanilkan [Fri, 23 Sep 2011 08:18:34 +0000 (10:18 +0200)]
Update changelog for Qt 4.8

Change recieved from James Perrett

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Thu, 22 Sep 2011 23:18:37 +0000 (09:18 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
  Sentences should end with a period! (Poor man's rebuild trigger.)
  Workaround MSVC2010 problems when linking QtWebKit
  dos2unix on a webkit source file (fix support for Visual Studio)

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 22 Sep 2011 18:44:55 +0000 (04:44 +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 broken Solaris build (getpwnam_r usage)

11 years agoFix broken Solaris build (getpwnam_r usage)
Iikka Eklund [Thu, 22 Sep 2011 13:11:42 +0000 (15:11 +0200)]
Fix broken Solaris build (getpwnam_r usage)

Added ifdef inside qt_tildeExpansion function to use correct
version of getpwnam_r depending on _C_POSIX_SOURCE version
on Solaris platform.

Task-number: QTBUG-21451
Merge-request: 1380
Reviewed-by: ossi
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Thu, 22 Sep 2011 14:40:42 +0000 (00:40 +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:
  Improve sbsv2 whatlog support.
  Modified SymSQL documentation in sql-driver.qdoc according review comments
  Added correct licence headers to symsql source files
  Documentation modifications for SymbianSQL added into sql-driver.qdoc
  Release Symbian SQL driver
  Fixed a typo found by static checker
  Added SQL driver plugin implementation for Symbian.
  Symbian: Fix qmdiarea autotest regressions
  Fix memory leaks in schema validation
  Symbian: Added copy-paste functionality to FEP input context
  Fix the incorrect sizeHint given by QLabel on Symbian

11 years agoImprove sbsv2 whatlog support.
Miikka Heikkinen [Thu, 22 Sep 2011 13:21:58 +0000 (16:21 +0300)]
Improve sbsv2 whatlog support.

All builds will now add anything generated via QMAKE_EXTRA_COMPILERS
to whatlog. In addition, platform builds will now add to whatlog
the exported mkspecs and qmake_clean.flm that were missing.

Task-number: QTBUG-21591
Reviewed-by: Sami Merila
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration
Qt Continuous Integration System [Thu, 22 Sep 2011 13:03:40 +0000 (23:03 +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:
  Sentences should end with a period! (Poor man's rebuild trigger.)
  Workaround MSVC2010 problems when linking QtWebKit
  dos2unix on a webkit source file (fix support for Visual Studio)

11 years agoSentences should end with a period! (Poor man's rebuild trigger.)
Andreas Kling [Thu, 22 Sep 2011 12:48:44 +0000 (14:48 +0200)]
Sentences should end with a period! (Poor man's rebuild trigger.)

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Thu, 22 Sep 2011 09:21:28 +0000 (19:21 +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: (95 commits)
  Update changes-4.8.0 file
  Only limit cursor position when line is wrapped
  Update changelog for Qt 4.8
  add 4.8 changes created/merged by me
  Fixed automatic plugin path resolving for predefined Qt plugins.
  Resolve a number of compilation issues with INTEGRITY
  runonphone: Include USB serial ports on OS X for CODA, too
  Update changelog for Qt 4.8.0
  Make sure cursor position doesn't exceed line end
  Allow shared EGL contexts for xcb and xlib platforms
  Allow generic EGL platform contexts to be shared
  Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE
  4.8 Changes: OpenGL Framebuffer Format
  stop tslib plugin having same file name as linux input plugin
  Avoid unnecessary detach of a QImage in QPixmapDropShadowFilter
  Update changelog for Qt 4.8
  Update changelog for Qt 4.8
  Updated change-log for 4.8
  Update changes file for 4.8.0
  Update changelog for Qt 4.8
  ...

11 years agoUpdate changes-4.8.0 file
aavit [Thu, 22 Sep 2011 09:04:53 +0000 (11:04 +0200)]
Update changes-4.8.0 file

11 years agoMerge remote-tracking branch 'qt-mainline/4.8'
aavit [Thu, 22 Sep 2011 09:02:18 +0000 (11:02 +0200)]
Merge remote-tracking branch 'qt-mainline/4.8'

Conflicts:
dist/changes-4.8.0

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-flex
Pasi Pentikainen [Thu, 22 Sep 2011 08:14:33 +0000 (11:14 +0300)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-flex

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Wed, 21 Sep 2011 23:17:05 +0000 (09:17 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
  Update changelog for Qt 4.8

11 years agoModified SymSQL documentation in sql-driver.qdoc according review comments
Timo Kauppinen [Mon, 5 Sep 2011 12:13:16 +0000 (15:13 +0300)]
Modified SymSQL documentation in sql-driver.qdoc according review comments

Task-number: QT-4860
Reviewed-by: Honglei Zhang
11 years agoAdded correct licence headers to symsql source files
Timo Kauppinen [Fri, 2 Sep 2011 12:51:32 +0000 (15:51 +0300)]
Added correct licence headers to symsql source files

Task-number: QT-4860
Reviewed-by: Honglei Zhang
11 years agoDocumentation modifications for SymbianSQL added into sql-driver.qdoc
Timo Kauppinen [Fri, 19 Aug 2011 06:51:45 +0000 (09:51 +0300)]
Documentation modifications for SymbianSQL added into sql-driver.qdoc

Task-number: QT-4860
Reviewed-by: Honglei Zhang
11 years agoRelease Symbian SQL driver
Honglei Zhang [Mon, 4 Jul 2011 10:17:35 +0000 (13:17 +0300)]
Release Symbian SQL driver

Symbian SQL driver provides service of secure databases. SQL databases
are stored in Symbian SQL server's private data cage. The API ensures
only authorised clients can access the database. The Symbian SQL driver
enables Qt application to use Symbian secure databases.

Task-number: QT-4860
Reviewed-by: Trust Me
11 years agoFixed a typo found by static checker
Timo Kauppinen [Mon, 23 May 2011 12:32:27 +0000 (15:32 +0300)]
Fixed a typo found by static checker

Task-number: QT-4860
Reviewd-by: Honglei Zhang
11 years agoAdded SQL driver plugin implementation for Symbian.
Timo Kauppinen [Wed, 13 Apr 2011 07:18:15 +0000 (10:18 +0300)]
Added SQL driver plugin implementation for Symbian.

The Symbian SQL driver enables the usage of native Symbian SQL server from Qt code. Symbian SQL driver also supports the usage of Symbian platform security capabilities.

Task-number: QT-4860
Reviewed-by: Honglei Zhang
11 years agoOnly limit cursor position when line is wrapped
Jiang Jiang [Tue, 20 Sep 2011 11:42:35 +0000 (13:42 +0200)]
Only limit cursor position when line is wrapped

Reviewed-by: Eskil
11 years agoMerge remote-tracking branch 'qtwebkit-integration/4.8'
Andreas Kling [Wed, 21 Sep 2011 10:51:09 +0000 (12:51 +0200)]
Merge remote-tracking branch 'qtwebkit-integration/4.8'

11 years agoSymbian: Fix qmdiarea autotest regressions
Miikka Heikkinen [Wed, 21 Sep 2011 10:16:34 +0000 (13:16 +0300)]
Symbian: Fix qmdiarea autotest regressions

Some cases in qmdiarea test passed on 4.7 but failed on 4.8.
A closer examination reveals that the cases are in any case
invalid in Symbian and should be skipped like in WinCE and
Mac.

Task-number: QT-5254
Reviewed-by: Sami Merila
11 years agoMerge branch 'SchemaMemLeak'
Honglei Zhang [Wed, 21 Sep 2011 10:04:35 +0000 (13:04 +0300)]
Merge branch 'SchemaMemLeak'

11 years agoFix memory leaks in schema validation
Honglei Zhang [Wed, 21 Sep 2011 08:53:30 +0000 (11:53 +0300)]
Fix memory leaks in schema validation

Bug fix for QTBUG-12550. QExplicitlySharedDataPointer is excessively
used in XmlPatterns code. This forumate cyclic loops in some situation.
This fix replace the shared data pointer with normal C++ pointer to
break the loop.

Task-number: QTBUG-12550
Reviewed-by: Tomi Vihria
11 years agoSymbian: Added copy-paste functionality to FEP input context
Miikka Heikkinen [Tue, 20 Sep 2011 11:36:24 +0000 (14:36 +0300)]
Symbian: Added copy-paste functionality to FEP input context

The support for copy-paste functionality in FEP was initially submitted
as merge request #1151, though that only provided support for
basic Qt edit widgets. I modified the code so that QML edit elements
are also supported, as well as any other editor that provides the
required "copy", "cut", and "paste" slots, and "canPaste" property.
A number of other minor fixes were also done to the original merge
request, as well as the removal of S60 version plugin elements.

Task-number: QTBUG-20921
Reviewed-by: Sami Merila
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Tue, 20 Sep 2011 23:16:13 +0000 (09:16 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (36 commits)
  add 4.8 changes created/merged by me
  Fixed automatic plugin path resolving for predefined Qt plugins.
  Resolve a number of compilation issues with INTEGRITY
  runonphone: Include USB serial ports on OS X for CODA, too
  Update changelog for Qt 4.8.0
  Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE
  runonphone: Implement traceswitch support for coda
  Fix missing clean up stack panic for a new thread in Symbian
  Regression in QS60Style when drawing webview scrollbars
  Cleanup qwidget_s60.cpp
  Fix panic when global QSettings instance needs flusing at app exit
  Fix uninitialised variable in temporary files
  More accurately determine bearer type for symbian GPRS/3G
  Add documentation for Symbian QSettings locations and security
  Update QDesktopServices openUrl() documentation on Symbian OS
  Mark binaries as SMPSAFE in Symbian
  Fix "sbs -c tools2 --what" output for Qt.
  Update environment.prf
  QS60Style: Make spinboxes and lineedits slightly taller
  runonphone: Add a missing space between a message and the file name
  ...

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Tue, 20 Sep 2011 20:26:26 +0000 (06:26 +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 changelog for Qt 4.8

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Tue, 20 Sep 2011 16:13:34 +0000 (02: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:
  symbian: Implement QNetworkConfiguration::purpose()

11 years agosymbian: Implement QNetworkConfiguration::purpose()
Shane Kearns [Tue, 20 Sep 2011 14:53:38 +0000 (15:53 +0100)]
symbian: Implement QNetworkConfiguration::purpose()

QNetworkConfiguration::purpose() will now return translated values
for the system SNAPs rather than always UnknownPurpose.
e.g. the "Internet" SNAP returns PublicPurpose, and the WAP/MMS SNAPs
return ServiceSpecificPurpose.
IAPs inherit the purpose of the service network that contains them,
unless the same IAP is present in more than one with conflicting
purposes, in which case UnknownPurpose is returned.

Task-Number: QTBUG-19166
Reviewed-By: mread
11 years agoWorkaround MSVC2010 problems when linking QtWebKit
Ademar de Souza Reis Jr [Tue, 20 Sep 2011 14:12:04 +0000 (11:12 -0300)]
Workaround MSVC2010 problems when linking QtWebKit

Include MSVC2010 in the list of compilers where incremental
build is disabled (INCREMENTAL:NO).

Change suggested by Simo Falt <simo.falt@nokia.com>

11 years agodos2unix on a webkit source file (fix support for Visual Studio)
Ademar de Souza Reis Jr [Mon, 19 Sep 2011 13:43:14 +0000 (10:43 -0300)]
dos2unix on a webkit source file (fix support for Visual Studio)

webkit/Source/WebCore/bindings/js/JSExceptionBase.h had CRLF
terminations, which Visual Studio didn't like for some reason.

Reported by Simo Falt. Patch is also being submited to upstream
(webkit.org)

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Tue, 20 Sep 2011 12:23:53 +0000 (22:23 +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: (31 commits)
  runonphone: Include USB serial ports on OS X for CODA, too
  runonphone: Implement traceswitch support for coda
  Fix missing clean up stack panic for a new thread in Symbian
  Regression in QS60Style when drawing webview scrollbars
  Cleanup qwidget_s60.cpp
  Fix panic when global QSettings instance needs flusing at app exit
  Fix uninitialised variable in temporary files
  More accurately determine bearer type for symbian GPRS/3G
  Add documentation for Symbian QSettings locations and security
  Update QDesktopServices openUrl() documentation on Symbian OS
  Mark binaries as SMPSAFE in Symbian
  Fix "sbs -c tools2 --what" output for Qt.
  Update environment.prf
  QS60Style: Make spinboxes and lineedits slightly taller
  runonphone: Add a missing space between a message and the file name
  runonphone: Allow overriding the temporary sis file name
  Fix QIcon auto-tests for Symbian
  Add a cast to moc cpp generator to remove armcc warnings
  Fix qt.conf for Symbian to use $${EPOCROOT}
  Remove few unused variables.
  ...

11 years agoUpdate changelog for Qt 4.8
Sinan Tanilkan [Tue, 20 Sep 2011 10:34:39 +0000 (12:34 +0200)]
Update changelog for Qt 4.8

Change recieved from John Brooks

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Tue, 20 Sep 2011 10:13:30 +0000 (20: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: (86 commits)
  Fixed automatic plugin path resolving for predefined Qt plugins.
  symbian bearer: fix tst_qnetworksession test failures
  Resolve a number of compilation issues with INTEGRITY
  Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE
  Update changelog for Qt 4.8
  QGraphicsWidget::setLayoutDirection doesn't propagate to new children
  Update changelog for Qt 4.8
  Prevent unnecessary graphics item updates when graphics effect changes.
  Updated change-log for 4.8
  Update changes file for 4.8.0
  Update changelog for Qt 4.8
  Use more widely supported Unicode character representation
  Release font engine refcount when done using it in QTextEngine
  My changes for 4.8.0
  minor docu fixes
  Fix - QGraphicsTextItem in a tab of QTabWidget cannot get focus
  Mingw compile error src/gui/accessible/qaccessible_win.cpp
  Updated Changelog
  My 4.8.0 changes.
  My 4.8.0 changes
  ...

11 years agoMerge remote-tracking branch 'qt/4.8'
Sami Lempinen [Tue, 20 Sep 2011 09:59:45 +0000 (12:59 +0300)]
Merge remote-tracking branch 'qt/4.8'

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Tue, 20 Sep 2011 06:26:28 +0000 (16:26 +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:
  add 4.8 changes created/merged by me
  Update changelog for Qt 4.8.0

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Tue, 20 Sep 2011 00:33:38 +0000 (10:33 +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 automatic plugin path resolving for predefined Qt plugins.
  Resolve a number of compilation issues with INTEGRITY
  Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Mon, 19 Sep 2011 23:18:28 +0000 (09:18 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
  Update changelog for Qt 4.8
  Update changelog for Qt 4.8
  Updated change-log for 4.8
  Update changes file for 4.8.0
  Update changelog for Qt 4.8
  My changes for 4.8.0
  My 4.8.0 changes.
  My 4.8.0 changes
  Mention Lighthouse in the changes file.
  Changelog: add waylandwindowmanager integration changes
  My 4.8.0 changes

11 years agoadd 4.8 changes created/merged by me
Oswald Buddenhagen [Mon, 19 Sep 2011 18:11:04 +0000 (20:11 +0200)]
add 4.8 changes created/merged by me

11 years agoFixed automatic plugin path resolving for predefined Qt plugins.
Janne Anttila [Mon, 19 Sep 2011 17:10:14 +0000 (19:10 +0200)]
Fixed automatic plugin path resolving for predefined Qt plugins.

When Qt is configured for static build, importing static plugins is
supposed to work as described in docs:
http://doc.qt.nokia.com/latest/qtplugin.html#Q_IMPORT_PLUGIN

This commit updates the qmake mapping for predefined Qt plugins, so
that Qt plugins are automatically found when QTPLUGIN keyword is used.

Task-number: QTBUG-18609
Merge-request: 1391
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integ...
Qt Continuous Integration System [Mon, 19 Sep 2011 16:03:32 +0000 (02:03 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
  minor docu fixes
  Mingw compile error src/gui/accessible/qaccessible_win.cpp
  Implement QAccessibleActionInterface for menu actions.
  Do not leak memory

11 years agosymbian bearer: fix tst_qnetworksession test failures
Shane Kearns [Mon, 19 Sep 2011 13:34:04 +0000 (14:34 +0100)]
symbian bearer: fix tst_qnetworksession test failures

Symbian is not reporting the expected KLinkLayerClosed event on the
last RConnection handle. Instead, it reports the event
KConfigDaemonFinishedDeregistrationStop, which indicates the nif
plugin is being destroyed (this is followed by unload events)

To fix, this event is treated the same as a link down event, and
results in the state change to disconnected.

Either there has been a behaviour change in the platform, or the
test was previously run with another user of the API running in the
background (e.g. WLAN wizard, connection monitor) which prevented
the unload.

Task-Number: QTBUG-21382
Reviewed-By: mread
11 years agoResolve a number of compilation issues with INTEGRITY
Rolland Dudemaine [Mon, 19 Sep 2011 15:03:22 +0000 (17:03 +0200)]
Resolve a number of compilation issues with INTEGRITY

First, #ifdef'ed out getpwuid_r() and getpwgid_r() usage since users/groups support is not in in single-process Posix mode.
Also, correct a typo and add missing files to io.pri.
Update documentation to disable libtiff which won't compile until ibtiff itself is updated, and add back -no-exceptions in the sample command line. And add a line to compile host tools.
Add a dummy QT_OPEN_LARGEFILE definition in qplatformdefs.h since there is code that requires it.
Move definition of getGlyph() after the definition of qHash(GlyphAndSubPixelPosition).

Merge-request: 2686
Reviewed-by: ossi
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Mon, 19 Sep 2011 12:34:28 +0000 (22:34 +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:
  runonphone: Include USB serial ports on OS X for CODA, too

11 years agorunonphone: Include USB serial ports on OS X for CODA, too
Martin Storsjo [Fri, 9 Sep 2011 09:01:18 +0000 (12:01 +0300)]
runonphone: Include USB serial ports on OS X for CODA, too

The actual devices are already detected in serenum_unix.cpp, but
when used with CODA, the eligible /dev entries apparently need
to be listed here, too.

Reviewed-By: Shane Kearns
Merge-Request: 1373

11 years agoUpdate changelog for Qt 4.8.0
Liang Qi [Mon, 19 Sep 2011 11:43:52 +0000 (13:43 +0200)]
Update changelog for Qt 4.8.0

For QtConcurrent and QUuid.

11 years agoMake sure cursor position doesn't exceed line end
Jiang Jiang [Mon, 19 Sep 2011 11:20:13 +0000 (13:20 +0200)]
Make sure cursor position doesn't exceed line end

If we have trailing spaces at the end of a line, cursor will disappear
because the position we returned exceeds line end, thus the widget
border. By limiting it within line.width we can make sure it always
visible, which is more consistent to the behavior in common platforms.

Reviewed-by: Eskil
11 years agoAllow shared EGL contexts for xcb and xlib platforms
Reuben Dowle [Mon, 19 Sep 2011 11:04:50 +0000 (13:04 +0200)]
Allow shared EGL contexts for xcb and xlib platforms

Merge-request: 1331
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
11 years agoAllow generic EGL platform contexts to be shared
Reuben Dowle [Mon, 19 Sep 2011 11:04:48 +0000 (13:04 +0200)]
Allow generic EGL platform contexts to be shared

Merge-request: 1331
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
11 years agoFix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE
Andy Shaw [Mon, 19 Sep 2011 08:52:32 +0000 (10:52 +0200)]
Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE

This solves a build issue on Solaris as the symbols were missing so
they are now added in the expected way after discussion with the
Nokia developer who approved the patch originally for winscw.

Task-number: QTBUG-21523
Merge-request: 1389
Reviewed-by: ossi
11 years ago4.8 Changes: OpenGL Framebuffer Format
Gerhard Roethlin [Mon, 19 Sep 2011 08:01:21 +0000 (10:01 +0200)]
4.8 Changes: OpenGL Framebuffer Format

Added an entry for the OpenGL Framebuffer Format commit to the 4.8
changelog.

Merge-request: 1387
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
11 years agostop tslib plugin having same file name as linux input plugin
Reuben Dowle [Mon, 19 Sep 2011 07:46:50 +0000 (09:46 +0200)]
stop tslib plugin having same file name as linux input plugin

Merge-request: 1330
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team
aavit [Mon, 19 Sep 2011 07:44:42 +0000 (09:44 +0200)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team

11 years agoAvoid unnecessary detach of a QImage in QPixmapDropShadowFilter
David Faure [Mon, 19 Sep 2011 07:23:29 +0000 (09:23 +0200)]
Avoid unnecessary detach of a QImage in QPixmapDropShadowFilter

Merge-request: 1374
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Mon, 19 Sep 2011 04:46:03 +0000 (14:46 +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 changelog for Qt 4.8
  Update changelog for Qt 4.8
  Updated change-log for 4.8
  Update changes file for 4.8.0
  Update changelog for Qt 4.8
  My changes for 4.8.0
  My 4.8.0 changes.
  My 4.8.0 changes
  Mention Lighthouse in the changes file.
  Changelog: add waylandwindowmanager integration changes
  My 4.8.0 changes

11 years agoMerge remote branch 'origin/4.8' into doc-staging-master
Rohan McGovern [Mon, 19 Sep 2011 04:12:35 +0000 (14:12 +1000)]
Merge remote branch 'origin/4.8' into doc-staging-master

Conflicts:
dist/changes-4.8.0

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Sun, 18 Sep 2011 23:17:54 +0000 (09:17 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
  QGraphicsWidget::setLayoutDirection doesn't propagate to new children
  Prevent unnecessary graphics item updates when graphics effect changes.
  Use more widely supported Unicode character representation
  Release font engine refcount when done using it in QTextEngine
  Fix - QGraphicsTextItem in a tab of QTabWidget cannot get focus
  Updated Changelog
  Do not put cursor at non-stop character positions
  doc: Fix incorrect enum name in QRawFont::alphaMapForGlyph docs

11 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Sun, 18 Sep 2011 23:00:11 +0000 (01:00 +0200)]
Merge branch '4.8-upstream' into master-water

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Sat, 17 Sep 2011 23:17:50 +0000 (09:17 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:

11 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Sat, 17 Sep 2011 23:00:12 +0000 (01:00 +0200)]
Merge branch '4.8-upstream' into master-water

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Sat, 17 Sep 2011 21:19:29 +0000 (07:19 +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:
  QGraphicsWidget::setLayoutDirection doesn't propagate to new children
  Prevent unnecessary graphics item updates when graphics effect changes.
  Use more widely supported Unicode character representation
  Release font engine refcount when done using it in QTextEngine
  Fix - QGraphicsTextItem in a tab of QTabWidget cannot get focus
  Updated Changelog
  Do not put cursor at non-stop character positions
  doc: Fix incorrect enum name in QRawFont::alphaMapForGlyph docs

11 years agoMerge remote branch 'qt-mainline/4.8'
aavit [Sat, 17 Sep 2011 19:44:51 +0000 (21:44 +0200)]
Merge remote branch 'qt-mainline/4.8'

11 years agoMerge remote branch 'qt-fire-review/master'
aavit [Sat, 17 Sep 2011 19:43:55 +0000 (21:43 +0200)]
Merge remote branch 'qt-fire-review/master'

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Fri, 16 Sep 2011 23:20:17 +0000 (09:20 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
  Update changes file.
  wtf? .pro.user files? congrats to overriding the hook!
  Fix QNetworkReply::errorString returning an untranslated string
  runonphone: Add a missing argument for QString::arg
  StrictlyEnforceRange with snapOneItem/Row and header behavior change
  Release font engine refcount when done using it in QTextEngine
  Migrate addMarkUp function to QChar.
  update the proxy info before session is opened in QNAM by Aapo Makela
  QSslCertificate: block all DigiNotar (intermediate and root) certs
  QSslCertificate: also check common name for blacklisted certificates
  Fix typo in header guard.
  fix doc typo
  Ensure that the corewlan plugin can be built with the Mac OS X 10.7 sdk
  remove obsolete define
  Fix assert error on Windows with a negative char.
  Doc: Fixed the example of an encoded URL in the class description.
  Added an additional check to workaround an issue on Windows.

11 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Fri, 16 Sep 2011 23:00:14 +0000 (01:00 +0200)]
Merge branch '4.8-upstream' into master-water

11 years agoMerge remote branch 'qt-fire-review/master'
aavit [Fri, 16 Sep 2011 19:39:44 +0000 (21:39 +0200)]
Merge remote branch 'qt-fire-review/master'

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master...
Qt Continuous Integration System [Fri, 16 Sep 2011 18:53:47 +0000 (04:53 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging:

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Fri, 16 Sep 2011 16:59:24 +0000 (02:59 +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:
  QGraphicsWidget::setLayoutDirection doesn't propagate to new children
  Prevent unnecessary graphics item updates when graphics effect changes.

11 years agoUpdate changelog for Qt 4.8
Sinan Tanilkan [Fri, 16 Sep 2011 15:56:19 +0000 (17:56 +0200)]
Update changelog for Qt 4.8

Change recieved from David Faure.

11 years agoQGraphicsWidget::setLayoutDirection doesn't propagate to new children
John Tapsell [Fri, 16 Sep 2011 13:41:41 +0000 (15:41 +0200)]
QGraphicsWidget::setLayoutDirection doesn't propagate to new children

Merge-request: 1360
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
11 years agoUpdate changelog for Qt 4.8
Sinan Tanilkan [Fri, 16 Sep 2011 13:05:51 +0000 (15:05 +0200)]
Update changelog for Qt 4.8

Change recieved from Steffen Hansen.

11 years agoPrevent unnecessary graphics item updates when graphics effect changes.
Christophe Oosterlynck [Fri, 16 Sep 2011 13:09:03 +0000 (15:09 +0200)]
Prevent unnecessary graphics item updates when graphics effect changes.

Don't invalidate a QGraphicsItem (neither its cache) when an update is
triggered because of a QGraphicsEffect attached to it.

Autotest for QGraphicsEffect extended with 2 cache invalidation tests

Merge-request: 2681
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
11 years agoUpdated change-log for 4.8
Christian Strømme [Fri, 16 Sep 2011 10:48:25 +0000 (12:48 +0200)]
Updated change-log for 4.8

11 years agoUpdate changes file for 4.8.0
Daniele E. Domenichelli [Thu, 15 Sep 2011 13:42:04 +0000 (14:42 +0100)]
Update changes file for 4.8.0

11 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Fri, 16 Sep 2011 12:33:56 +0000 (22:33 +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:
  StrictlyEnforceRange with snapOneItem/Row and header behavior change
  Release font engine refcount when done using it in QTextEngine
  Migrate addMarkUp function to QChar.
  update the proxy info before session is opened in QNAM by Aapo Makela
  QSslCertificate: block all DigiNotar (intermediate and root) certs
  QSslCertificate: also check common name for blacklisted certificates
  Fix typo in header guard.
  fix doc typo
  Ensure that the corewlan plugin can be built with the Mac OS X 10.7 sdk
  remove obsolete define
  Fix assert error on Windows with a negative char.
  Doc: Fixed the example of an encoded URL in the class description.
  Added an additional check to workaround an issue on Windows.

11 years agoUpdate changelog for Qt 4.8
Sinan Tanilkan [Fri, 16 Sep 2011 12:13:36 +0000 (14:13 +0200)]
Update changelog for Qt 4.8

Change recieved from Cédric OCHS.
https://qt.gitorious.org/qt/qt/merge_requests/1157

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Fri, 16 Sep 2011 11:37:18 +0000 (21:37 +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:
  runonphone: Implement traceswitch support for coda
  Fix missing clean up stack panic for a new thread in Symbian
  Regression in QS60Style when drawing webview scrollbars
  Cleanup qwidget_s60.cpp

11 years agorunonphone: Implement traceswitch support for coda
Shane Kearns [Thu, 15 Sep 2011 14:07:08 +0000 (15:07 +0100)]
runonphone: Implement traceswitch support for coda

The traceswitch application redirects debug messages to the USB
port. This was supported by the TRK backend but not by the CODA
backend.

1. CODA backend now recognises mux channel 2 as valid
2. new TextTraceHandler class to attach to channel 2 and decode
   trace packets / print them to stdout
3. CODA signal handler creates a TextTraceHandler & destroys it
   on shutdown

Reviewed-By: Miikka Heikkinen
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Fri, 16 Sep 2011 11:18:17 +0000 (21:18 +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:
  Use more widely supported Unicode character representation
  Release font engine refcount when done using it in QTextEngine
  Fix - QGraphicsTextItem in a tab of QTabWidget cannot get focus
  Updated Changelog
  Do not put cursor at non-stop character positions
  doc: Fix incorrect enum name in QRawFont::alphaMapForGlyph docs

11 years agoUse more widely supported Unicode character representation
Jiang Jiang [Fri, 16 Sep 2011 11:03:15 +0000 (13:03 +0200)]
Use more widely supported Unicode character representation

11 years agoRelease font engine refcount when done using it in QTextEngine
Jiang Jiang [Fri, 9 Sep 2011 12:31:39 +0000 (14:31 +0200)]
Release font engine refcount when done using it in QTextEngine

5f2b6dd2a50275bc05ae5d7e9dd8902d6d49d9df increased refcounts for
font engines in QTextEngine cache, we need to decrease them when
the QTextEngine is deallocated.

Task-number: QTBUG-21222
Reviewed-by: Eskil
11 years agoMy changes for 4.8.0
Joerg Bornemann [Fri, 16 Sep 2011 10:12:54 +0000 (12:12 +0200)]
My changes for 4.8.0

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Fri, 16 Sep 2011 05:31:08 +0000 (15:31 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
  minor docu fixes

11 years agominor docu fixes
Konstantin Ritt [Thu, 15 Sep 2011 23:37:35 +0000 (01:37 +0200)]
minor docu fixes

Merge-request: 2646
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Thu, 15 Sep 2011 23:16:24 +0000 (09:16 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
  Fix crash in compiled bindings
  Updated WebKit to 64cce10 (qtwebkit-rc1, week36)

11 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Thu, 15 Sep 2011 23:00:14 +0000 (01:00 +0200)]
Merge branch '4.8-upstream' into master-water