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

* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-team: (157 commits)
  Update copyright year to 2011.
  Fix reversed condition introduced in 9a6cfc07e5
  Add /DYNAMICBASE /NXCOMPAT to linker options in Visual Studio 2005 and higher
  Fix compilation error on Solaris
  Check elapsed time only once
  Added api for efficient data driven baseline testing
  Assistant: Fix warnings.
  Assistant: Don't tabify "Open Pages" dock widget by default.
  QmlViewer: Remove unused class variables
  Fixed bug and performance problem in windowsstyle.
  Restored old flushing behavior in -graphicssystem opengl on desktop.
  Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANs
  Designer: Block QEvent::WinIdChange.
  QUrl::setUrl should call detach
  qkeymapper_x11.cpp: fix compilation with LSB and without XKB
  tst_qscriptclass: backport test from the v8 branch
  QHostInfoCache: Use QElapsedTime instead of QTime
  Remove unnecessarily frozen functions from QtOpenGL WINSCW DEF file
  Cocoa: add support for QEventLoop::ExcludeUserInputEvents
  Updated QTOpenGL DEF files for WINSCW and ARMV5
  ...

11 years agoUpdate copyright year to 2011.
Jason McDonald [Mon, 10 Jan 2011 16:12:26 +0000 (02:12 +1000)]
Update copyright year to 2011.

Reviewed-by: Trust Me
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-team
Jason McDonald [Mon, 10 Jan 2011 16:02:33 +0000 (02:02 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-team

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-team
Qt Continuous Integration System [Mon, 10 Jan 2011 15:56:30 +0000 (01:56 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-team

* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-team:
  BM2: Little fix to make the `make check-trusted' to work on Linux and Windows.

11 years agoBM2: Little fix to make the `make check-trusted' to work on Linux and Windows.
Sergio Ahumada [Mon, 10 Jan 2011 15:51:10 +0000 (16:51 +0100)]
BM2: Little fix to make the `make check-trusted' to work on Linux and Windows.

Reviewed-by: Joao
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Mon, 10 Jan 2011 12:09:39 +0000 (22:09 +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 reversed condition introduced in 9a6cfc07e5
  Add /DYNAMICBASE /NXCOMPAT to linker options in Visual Studio 2005 and higher
  Fix compilation error on Solaris
  Check elapsed time only once

11 years agoFix reversed condition introduced in 9a6cfc07e5
João Abecasis [Mon, 10 Jan 2011 11:39:16 +0000 (12:39 +0100)]
Fix reversed condition introduced in 9a6cfc07e5

Reviewed-by: Bradley T. Hughes
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Sat, 8 Jan 2011 05:50:11 +0000 (15:50 +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 /DYNAMICBASE /NXCOMPAT to linker options in Visual Studio 2005 and higher
  Fix compilation error on Solaris
  Check elapsed time only once

11 years agoMerge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Sat, 8 Jan 2011 02:23:15 +0000 (12:23 +1000)]
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  QmlViewer: Remove unused class variables
  Fixed bug and performance problem in windowsstyle.
  Restored old flushing behavior in -graphicssystem opengl on desktop.
  Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANs
  Designer: Block QEvent::WinIdChange.
  QUrl::setUrl should call detach
  qkeymapper_x11.cpp: fix compilation with LSB and without XKB

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Fri, 7 Jan 2011 23:03:14 +0000 (09: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:
  Add /DYNAMICBASE /NXCOMPAT to linker options in Visual Studio 2005 and higher
  Fix compilation error on Solaris
  Check elapsed time only once

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Fri, 7 Jan 2011 19:37:57 +0000 (05:37 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Added api for efficient data driven baseline testing
  Need not keep client waiting until server has saved

11 years agoAdd /DYNAMICBASE /NXCOMPAT to linker options in Visual Studio 2005 and higher
miniak [Fri, 7 Jan 2011 18:16:33 +0000 (19:16 +0100)]
Add /DYNAMICBASE /NXCOMPAT to linker options in Visual Studio 2005 and higher

Native Win32 C++ projects created in Visual Studio have this enabled in the default configuration in order to increase security.

Merge-request: 2539
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoMerge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Fri, 7 Jan 2011 16:30:00 +0000 (02:30 +1000)]
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  QmlViewer: Remove unused class variables
  Fixed bug and performance problem in windowsstyle.
  Restored old flushing behavior in -graphicssystem opengl on desktop.
  Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANs
  Designer: Block QEvent::WinIdChange.
  QUrl::setUrl should call detach
  qkeymapper_x11.cpp: fix compilation with LSB and without XKB

11 years agoMerge branch 4.7 into qt-master-from-4.7
Qt Continuous Integration System [Fri, 7 Jan 2011 16:06:12 +0000 (02:06 +1000)]
Merge branch 4.7 into qt-master-from-4.7

11 years agoFix compilation error on Solaris
João Abecasis [Thu, 6 Jan 2011 16:16:20 +0000 (17:16 +0100)]
Fix compilation error on Solaris

d_type in dirent is a non-standard extension to POSIX available on some
platforms (namely BSDs, Mac, Linux, Symbian).

Taking the conservative approach and using this information only on
platforms known to support it.

Reviewed-by: Shane Kearns
11 years agoCheck elapsed time only once
João Abecasis [Wed, 5 Jan 2011 14:24:50 +0000 (15:24 +0100)]
Check elapsed time only once

Task-number: QTBUG-16262
Reviewed-by: Bradley T. Hughes
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
aavit [Fri, 7 Jan 2011 15:50:33 +0000 (16:50 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2

11 years agoMerge branch 'lancelot'
aavit [Fri, 7 Jan 2011 15:48:48 +0000 (16:48 +0100)]
Merge branch 'lancelot'

11 years agoAdded api for efficient data driven baseline testing
aavit [Fri, 7 Jan 2011 15:47:04 +0000 (16:47 +0100)]
Added api for efficient data driven baseline testing

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Fri, 7 Jan 2011 13:17:06 +0000 (23:17 +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:
  Assistant: Fix warnings.
  Assistant: Don't tabify "Open Pages" dock widget by default.

11 years agoAssistant: Fix warnings.
Christian Kandeler [Fri, 7 Jan 2011 13:03:52 +0000 (14:03 +0100)]
Assistant: Fix warnings.

11 years agoAssistant: Don't tabify "Open Pages" dock widget by default.
Christian Kandeler [Fri, 7 Jan 2011 10:56:33 +0000 (11:56 +0100)]
Assistant: Don't tabify "Open Pages" dock widget by default.

The user is likely to always want to see it plus one of the others.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Fri, 7 Jan 2011 11:04:43 +0000 (21:04 +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:
  QmlViewer: Remove unused class variables

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Fri, 7 Jan 2011 07:51:45 +0000 (17:51 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fixed bug and performance problem in windowsstyle.
  Restored old flushing behavior in -graphicssystem opengl on desktop.

11 years agoQmlViewer: Remove unused class variables
Kai Koehne [Fri, 7 Jan 2011 07:47:51 +0000 (08:47 +0100)]
QmlViewer: Remove unused class variables

11 years agoFixed bug and performance problem in windowsstyle.
Samuel Rødal [Thu, 6 Jan 2011 12:09:14 +0000 (13:09 +0100)]
Fixed bug and performance problem in windowsstyle.

QImage::fill(Qt::transparent) pre-4.8 is a bug, also using Format_ARGB32
is very unoptimal compared to Format_ARGB32_Premultiplied.

Task-number: QTBUG-16439
Reviewed-by: Eskil Abrahamsen Blomfeldt
11 years agoRestored old flushing behavior in -graphicssystem opengl on desktop.
Samuel Rødal [Wed, 5 Jan 2011 07:25:56 +0000 (08:25 +0100)]
Restored old flushing behavior in -graphicssystem opengl on desktop.

Change 284211ccbd2cbd recently introduced a fix for EGL, to prevent
flushing when nothing has been rendered into the back buffer. However,
the skip should only be done when there's no partial update support in
the window surface. If there is partial update support we can still
flush as usual.

Reviewed-by: Gunnar Sletta
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master...
Qt Continuous Integration System [Fri, 7 Jan 2011 06:02:28 +0000 (16:02 +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:
  Remove unnecessarily frozen functions from QtOpenGL WINSCW DEF file
  Updated QTOpenGL DEF files for WINSCW and ARMV5
  Updated DEF files for QtOpenGL for WINSCW and ARMV5

11 years agoMerge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Fri, 7 Jan 2011 02:40:07 +0000 (12:40 +1000)]
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  PathView crashed when the path is provided with undefined values.
  PathView: update modelCount before attempting to regenerate delegates.
  Update docs - calling overloaded functions from QML is now supported
  Doc fixes for introduction page and Item docs

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master...
Qt Continuous Integration System [Thu, 6 Jan 2011 23:19:34 +0000 (09:19 +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:
  Remove unnecessarily frozen functions from QtOpenGL WINSCW DEF file
  Updated QTOpenGL DEF files for WINSCW and ARMV5
  Updated DEF files for QtOpenGL for WINSCW and ARMV5

11 years agoMerge commit 'qt-releng-review/master'
Eckhart Koppen [Thu, 6 Jan 2011 20:57:47 +0000 (22:57 +0200)]
Merge commit 'qt-releng-review/master'

11 years agoMerge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Thu, 6 Jan 2011 20:05:55 +0000 (06:05 +1000)]
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  PathView crashed when the path is provided with undefined values.
  PathView: update modelCount before attempting to regenerate delegates.
  Update docs - calling overloaded functions from QML is now supported
  Doc fixes for introduction page and Item docs

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 6 Jan 2011 19:11:35 +0000 (05:11 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANs

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 6 Jan 2011 16:22:23 +0000 (02: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:
  QHostInfoCache: Use QElapsedTime instead of QTime

11 years agoMerge branch 4.7 into qt-master-from-4.7
Qt Continuous Integration System [Thu, 6 Jan 2011 16:04:26 +0000 (02:04 +1000)]
Merge branch 4.7 into qt-master-from-4.7

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Thu, 6 Jan 2011 15:46:03 +0000 (01:46 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Designer: Block QEvent::WinIdChange.
  QUrl::setUrl should call detach
  qkeymapper_x11.cpp: fix compilation with LSB and without XKB

11 years agoFix KERN-EXEC 0 panic on exit when bearer is searching for WLANs
Shane Kearns [Thu, 6 Jan 2011 15:16:03 +0000 (15:16 +0000)]
Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANs

The access point scanner cancels itself in the destructor.
This requires the handle to be valid, but it was closed in the symbian
engine destructor immediately before deleting the AP scanner.
Because of the way symbian active objects work, the crashing function
is only called if there was an asynchronous request in progress.
So it could be missed in cases where the scan completes faster than the
test case.

Task-number: QTBUG-16484
Reviewed-by: Markus Goetz
11 years agoDesigner: Block QEvent::WinIdChange.
Friedemann Kleint [Thu, 6 Jan 2011 14:34:48 +0000 (15:34 +0100)]
Designer: Block QEvent::WinIdChange.

As it causes an obscure deletion crash related to
the formeditor rubberband on Mac.

Reviewed-by: con
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team
Qt Continuous Integration System [Thu, 6 Jan 2011 14:15:17 +0000 (00:15 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team:
  Remove unnecessarily frozen functions from QtOpenGL WINSCW DEF file

11 years agoQUrl::setUrl should call detach
Olivier Goffart [Thu, 6 Jan 2011 13:51:04 +0000 (14:51 +0100)]
QUrl::setUrl should call detach

Task-number: QTBUG-16425
Reviewed-by: Gabriel
Reviewed-by: Markus Goetz
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Thu, 6 Jan 2011 13:22:53 +0000 (23:22 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  tst_qscriptclass: backport test from the v8 branch

11 years agoqkeymapper_x11.cpp: fix compilation with LSB and without XKB
Olivier Goffart [Thu, 6 Jan 2011 13:01:53 +0000 (14:01 +0100)]
qkeymapper_x11.cpp: fix compilation with LSB and without XKB

Task-number: QTBUG-16312
Reviewed-by: Marius Storm-Olsen
11 years agotst_qscriptclass: backport test from the v8 branch
Olivier Goffart [Thu, 6 Jan 2011 12:16:37 +0000 (13:16 +0100)]
tst_qscriptclass: backport test from the v8 branch

From commit 4e39278225
Add test coverage to match 4.7 behaviour regarding original properties

11 years agoQHostInfoCache: Use QElapsedTime instead of QTime
Niklas Kurkisuo [Thu, 6 Jan 2011 08:39:14 +0000 (10:39 +0200)]
QHostInfoCache: Use QElapsedTime instead of QTime

Use QElapsedTime instead of QTime for performance gain. See QT-2965 for
more info.

Task-number: QTBUG-16468
Reviewed-by: Markus Goetz
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integ...
Qt Continuous Integration System [Thu, 6 Jan 2011 09:44:58 +0000 (19:44 +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:
  Cocoa: add support for QEventLoop::ExcludeUserInputEvents

11 years agoRemove unnecessarily frozen functions from QtOpenGL WINSCW DEF file
Eckhart Koppen [Thu, 6 Jan 2011 09:44:36 +0000 (11:44 +0200)]
Remove unnecessarily frozen functions from QtOpenGL WINSCW DEF file

Reviewed-by: TrustMe
11 years agoCocoa: add support for QEventLoop::ExcludeUserInputEvents
Richard Moe Gustavsen [Thu, 6 Jan 2011 08:44:22 +0000 (09:44 +0100)]
Cocoa: add support for QEventLoop::ExcludeUserInputEvents

Seems like this was just missing when used together with the
DialogExec/EventLoopExec flags. This patch avoid using cocoas
own run methods for dispatching events when we want to
exclude user input events, and instead do it ourselves.

This patch will only fix this issue when no modal windows are
showing. For modal windows, a bit more research is needed.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 6 Jan 2011 09:28:55 +0000 (19:28 +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:
  PathView crashed when the path is provided with undefined values.
  PathView: update modelCount before attempting to regenerate delegates.

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team
Qt Continuous Integration System [Thu, 6 Jan 2011 09:14:48 +0000 (19:14 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team:
  Updated QTOpenGL DEF files for WINSCW and ARMV5

11 years agoUpdated QTOpenGL DEF files for WINSCW and ARMV5
Eckhart Koppen [Thu, 6 Jan 2011 09:10:41 +0000 (11:10 +0200)]
Updated QTOpenGL DEF files for WINSCW and ARMV5

Marked more functions absent

Reviewed-by: TrustMe
11 years agoPathView crashed when the path is provided with undefined values.
Martin Jones [Thu, 6 Jan 2011 06:57:06 +0000 (16:57 +1000)]
PathView crashed when the path is provided with undefined values.

Task-number: QTBUG-16356
Reviewed-by: Bea Lam
11 years agoPathView: update modelCount before attempting to regenerate delegates.
Martin Jones [Thu, 6 Jan 2011 05:48:52 +0000 (15:48 +1000)]
PathView: update modelCount before attempting to regenerate delegates.

If the model is a VisualDataModel, the count will initally be zero
and modelCount is not updated due to itemsInserted() before the
component is completed.

Task-number: QTBUG-16357
Reviewed-by: Bea Lam
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 6 Jan 2011 05:33:51 +0000 (15:33 +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:
  Update docs - calling overloaded functions from QML is now supported
  Doc fixes for introduction page and Item docs

11 years agoUpdate docs - calling overloaded functions from QML is now supported
Bea Lam [Thu, 6 Jan 2011 04:10:35 +0000 (14:10 +1000)]
Update docs - calling overloaded functions from QML is now supported

11 years agoDoc fixes for introduction page and Item docs
Bea Lam [Thu, 6 Jan 2011 01:16:49 +0000 (11:16 +1000)]
Doc fixes for introduction page and Item docs

Moved 'Identity' and 'Property Change Signals' sections from Item
docs to the intro page, which previously had a section on ids but
this has been moved out of the 'Properties' section since an id isn't
an ordinary property.

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team
Qt Continuous Integration System [Thu, 6 Jan 2011 00:12:59 +0000 (10:12 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (118 commits)
  Updated DEF files for QtOpenGL for WINSCW and ARMV5
  Fix link error on MacOS
  Allow QWidget with size larger than 16383 on Mac OS X (Cocoa)
  Set no brush when the brush is a solid patern transparent color.
  Fixed networkselftest failing to resolve hostname
  tst_qmessagebox: fix `about' test on mac
  tst_qmessagebox: make the failure message better for detailsButtonText
  tst_qmessagebox: simulate key events more robustly
  Clear WSERV content when a native child receives an "expose"
  Fixed a bug in elf2e32_qtwrapper regarding spaces in def files.
  Fixed several compile and deployment issues in the mmf phonon plugin.
  Fix fullscreen/Maximized dialog misplacement in Symbian
  Whitespace change
  Fix for coding conventions.
  Fix resource leak in QCLuceneStandardAnalyzer::QCLuceneStandardAnalyzer.
  Fix resource leak in QCLuceneStopAnalyzer::QCLuceneStopAnalyzer.
  Add Postgresql 8.x and 9 supports
  WorkerScript could starve image loading of CPU.
  More docs for FolderListModel
  Improve docs on attached properties on view delegates.
  ...

11 years agoUpdated DEF files for QtOpenGL for WINSCW and ARMV5
Eckhart Koppen [Wed, 5 Jan 2011 19:59:25 +0000 (21:59 +0200)]
Updated DEF files for QtOpenGL for WINSCW and ARMV5

Marked QGLContextResource::value absent

Reviewed-by: TrustMe
11 years agoMerge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Wed, 5 Jan 2011 18:20:10 +0000 (04:20 +1000)]
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  Fix outdated tests
  Fix def file names for libinfixed testlib
  Generate freeze targets in Symbian
  QMeeGoGraphicsSystemHelper::setSwapBehavior implementation.
  Support for swap modes in QGLWindowSurface.
  Pre-create the GL share widget before window surface creation.
  QMeeGoSwitchEvent exported and static.
  Fixed first element being a LineToElement in QPainterPath::connectPath()
  Update visual tests
  Ignore static_and_shared in Symbian builds.

11 years agoMerge branch 4.7 into qt-master-from-4.7
Qt Continuous Integration System [Wed, 5 Jan 2011 16:04:57 +0000 (02:04 +1000)]
Merge branch 4.7 into qt-master-from-4.7

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master...
Qt Continuous Integration System [Wed, 5 Jan 2011 15:05:27 +0000 (01:05 +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:
  Added patch for temporary support for --listgen option in qmake
  Fixed broken configuration step for Symbian builds

11 years agoMerge commit 'qt-releng-review/master'
Eckhart Koppen [Wed, 5 Jan 2011 14:15:24 +0000 (16:15 +0200)]
Merge commit 'qt-releng-review/master'

11 years agoMerge commit 'qt-master/master'
Eckhart Koppen [Wed, 5 Jan 2011 13:54:38 +0000 (15:54 +0200)]
Merge commit 'qt-master/master'

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Wed, 5 Jan 2011 12:06:15 +0000 (22:06 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Added warning if <QGLFunctions> is included when GLEW is present.

11 years agoAdded warning if <QGLFunctions> is included when GLEW is present.
Samuel Rødal [Wed, 5 Jan 2011 11:14:38 +0000 (12:14 +0100)]
Added warning if <QGLFunctions> is included when GLEW is present.

GLEW can not be used in combination with <QGLFunctions>.

Reviewed-by: Eskil Abrahamsen Blomfeldt
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team
Qt Continuous Integration System [Wed, 5 Jan 2011 10:17:46 +0000 (20:17 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team:
  Added patch for temporary support for --listgen option in qmake

11 years agoAdded patch for temporary support for --listgen option in qmake
Eckhart Koppen [Wed, 5 Jan 2011 08:55:04 +0000 (10:55 +0200)]
Added patch for temporary support for --listgen option in qmake

The --listgen option is needed in qmake for Symbian platform builds
to list the files generated by qmake. This patch enables qmake to
recognize this option, but is not functional, just to allow builds to
succeed. This patch is not applied to qmake directly, but only made
available in the source tree for usage in the build setup.

Reviewed-by: TrustMe
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Wed, 5 Jan 2011 05:51:17 +0000 (15:51 +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 outdated tests

11 years agoFix outdated tests
Alan Alpert [Wed, 5 Jan 2011 05:41:56 +0000 (15:41 +1000)]
Fix outdated tests

selftest_noimages and qdeclarativespringanimation were correct, updating
test scripts to match.

Task-number: QTBUG-14792

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

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team:
  Fixed broken configuration step for Symbian builds

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Tue, 4 Jan 2011 19:29:48 +0000 (05:29 +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:
  Allow QWidget with size larger than 16383 on Mac OS X (Cocoa)

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Tue, 4 Jan 2011 16:26:46 +0000 (02:26 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fix def file names for libinfixed testlib
  Generate freeze targets in Symbian

11 years agoMerge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engine...
Qt Continuous Integration System [Tue, 4 Jan 2011 16:14:04 +0000 (02:14 +1000)]
Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor into master-integration

* 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor:
  Fix link error on MacOS
  Fix qfile test crash with glibc
  Fix qfile test errors
  Update def files
  Add autotests for AutoCloseHandle / DontCloseHandle and RFile adoption
  QFile API: add API to specify if adopted file handles should be closed

11 years agoFix def file names for libinfixed testlib
Miikka Heikkinen [Tue, 4 Jan 2011 15:16:03 +0000 (17:16 +0200)]
Fix def file names for libinfixed testlib

Reviewed-by: Janne Koskinen
11 years agoGenerate freeze targets in Symbian
Miikka Heikkinen [Tue, 4 Jan 2011 14:20:55 +0000 (16:20 +0200)]
Generate freeze targets in Symbian

Make it possible to freeze def files via makefile targets.

Task-number: QTBUG-13769
Reviewed-by: Janne Koskinen
11 years agoFixed broken configuration step for Symbian builds
Eckhart Koppen [Tue, 4 Jan 2011 14:34:27 +0000 (16:34 +0200)]
Fixed broken configuration step for Symbian builds

Non-existing exports were removed, and errors caused by whitespace
conversion in the FLM used for configuration were corrected.

Reviewed-by: TrustMe
11 years agoFix link error on MacOS
Shane Kearns [Tue, 4 Jan 2011 14:27:41 +0000 (14:27 +0000)]
Fix link error on MacOS

11 years agoAllow QWidget with size larger than 16383 on Mac OS X (Cocoa)
Prasanth Ullattil [Tue, 4 Jan 2011 11:03:37 +0000 (12:03 +0100)]
Allow QWidget with size larger than 16383 on Mac OS X (Cocoa)

The restriction in place seems to be from the carbon ages, this is not
required for cocoa, so removing it. QWidget autotests runs as before.

Task-number: QTBUG-11415
Reviewed-by: Joao
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Tue, 4 Jan 2011 13:00:21 +0000 (23:00 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  QMeeGoGraphicsSystemHelper::setSwapBehavior implementation.
  Support for swap modes in QGLWindowSurface.
  Pre-create the GL share widget before window surface creation.
  QMeeGoSwitchEvent exported and static.
  Fixed first element being a LineToElement in QPainterPath::connectPath()

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Tue, 4 Jan 2011 12:38:25 +0000 (22:38 +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:
  Set no brush when the brush is a solid patern transparent color.

11 years agoSet no brush when the brush is a solid patern transparent color.
Pierre Rossi [Wed, 29 Dec 2010 17:12:30 +0000 (18:12 +0100)]
Set no brush when the brush is a solid patern transparent color.

Fix a bug in pdf print engine that was noticeable when printing
a webpage: the missing image graphic didn't appear in the pdf.

Task-number: QTBUG-16435
Reviewed-by: sroedal
11 years agoQMeeGoGraphicsSystemHelper::setSwapBehavior implementation.
Michael Dominic K [Tue, 4 Jan 2011 09:53:58 +0000 (10:53 +0100)]
QMeeGoGraphicsSystemHelper::setSwapBehavior implementation.

Merge-request: 993
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
11 years agoSupport for swap modes in QGLWindowSurface.
Michael Dominic K [Tue, 4 Jan 2011 09:53:57 +0000 (10:53 +0100)]
Support for swap modes in QGLWindowSurface.

AlwaysFull and AlwaysPartial implemented in ES only for now.
By default do automatic.

Merge-request: 993
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
11 years agoPre-create the GL share widget before window surface creation.
Michael Dominic K [Tue, 4 Jan 2011 09:28:20 +0000 (10:28 +0100)]
Pre-create the GL share widget before window surface creation.

Not pixmap creation.

Merge-request: 988
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
11 years agoQMeeGoSwitchEvent exported and static.
Michael Dominic K [Tue, 4 Jan 2011 08:29:06 +0000 (09:29 +0100)]
QMeeGoSwitchEvent exported and static.

Merge-request: 1009
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
11 years agoFixed first element being a LineToElement in QPainterPath::connectPath()
Samuel Rødal [Tue, 4 Jan 2011 07:39:22 +0000 (08:39 +0100)]
Fixed first element being a LineToElement in QPainterPath::connectPath()

This would produce an invalid path, causing potential crashes in various
parts of Qt.

Task-number: QTBUG-16377
Reviewed-by: Gunnar Sletta
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Tue, 4 Jan 2011 06:48:33 +0000 (16:48 +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:
  Update visual tests

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Tue, 4 Jan 2011 03:33:40 +0000 (13:33 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Ignore static_and_shared in Symbian builds.

11 years agoUpdate visual tests
Alan Alpert [Tue, 4 Jan 2011 01:12:30 +0000 (11:12 +1000)]
Update visual tests

Minor changes in flickable and rectangle radius behaviours have led to
some altered pixels here and there.

Task-number: QTBUG-14792

11 years agoIgnore static_and_shared in Symbian builds.
Miikka Heikkinen [Mon, 3 Jan 2011 10:35:16 +0000 (12:35 +0200)]
Ignore static_and_shared in Symbian builds.

The function addExclusiveBuilds doesn't work on Symbian and is unlikely
to ever work due to build system mandated target directories, so ignore
static_and_shared in Symbian builds that rely on Symbian toolchains.

Task-number: QTBUG-16298
Reviewed-by: axis
11 years agoMerge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engine...
Qt Continuous Integration System [Fri, 31 Dec 2010 22:36:10 +0000 (08:36 +1000)]
Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor into master-integration

* 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor:
  Fix qfile test crash with glibc
  Fix qfile test errors
  Update def files
  Add autotests for AutoCloseHandle / DontCloseHandle and RFile adoption
  QFile API: add API to specify if adopted file handles should be closed

11 years agoMerge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Fri, 31 Dec 2010 19:07:33 +0000 (05:07 +1000)]
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  Fixed networkselftest failing to resolve hostname

11 years agoMerge branch 4.7 into qt-master-from-4.7
Qt Continuous Integration System [Fri, 31 Dec 2010 16:03:27 +0000 (02:03 +1000)]
Merge branch 4.7 into qt-master-from-4.7

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Thu, 30 Dec 2010 22:43:34 +0000 (08:43 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fixed networkselftest failing to resolve hostname

11 years agoFixed networkselftest failing to resolve hostname
Rohan McGovern [Thu, 30 Dec 2010 22:20:39 +0000 (08:20 +1000)]
Fixed networkselftest failing to resolve hostname

The logic here was the opposite from what was intended.

Note that this bug was hidden under normal circumstances when running
the entire testcase.  It only appeared when one of the following was
true: (1) httpProxy or socks5Proxy was run on its own, or (2) the
dnsResolution test failed.

11 years agoMerge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engine...
Qt Continuous Integration System [Thu, 30 Dec 2010 19:43:12 +0000 (05:43 +1000)]
Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor into master-integration

* 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor:
  Fix qfile test crash with glibc
  Fix qfile test errors
  Update def files
  Add autotests for AutoCloseHandle / DontCloseHandle and RFile adoption
  QFile API: add API to specify if adopted file handles should be closed

11 years agoMerge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Thu, 30 Dec 2010 16:26:27 +0000 (02:26 +1000)]
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  Clear WSERV content when a native child receives an "expose"

11 years agoMerge branch 4.7 into qt-master-from-4.7
Qt Continuous Integration System [Thu, 30 Dec 2010 16:08:44 +0000 (02:08 +1000)]
Merge branch 4.7 into qt-master-from-4.7

11 years agoMerge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engine...
Qt Continuous Integration System [Thu, 30 Dec 2010 12:52:41 +0000 (22:52 +1000)]
Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor into master-integration

* 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor:
  Fix qfile test crash with glibc
  Fix qfile test errors
  Update def files
  Add autotests for AutoCloseHandle / DontCloseHandle and RFile adoption
  QFile API: add API to specify if adopted file handles should be closed

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Thu, 30 Dec 2010 09:17:15 +0000 (19:17 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  tst_qmessagebox: fix `about' test on mac
  tst_qmessagebox: make the failure message better for detailsButtonText
  tst_qmessagebox: simulate key events more robustly
  Prevented infinite loop in QMoviePrivate::next().
  Added int overloads to QPoint operator* and operator*=.
  tst_qmessagebox: add debug to know why it fails
  QMessageBox wrong Show/Hide Details button label

11 years agotst_qmessagebox: fix `about' test on mac
Rohan McGovern [Thu, 30 Dec 2010 05:25:38 +0000 (15:25 +1000)]
tst_qmessagebox: fix `about' test on mac

QMessageBox::about and aboutQt are modeless on Mac (only).
This means that if we simulate key events, we need to explicitly
run the event loop until they are consumed.

Prior to a31d271bdd4594ea455736a0000cd3493b0efc93, this buggy test was
causing detailsButtonText to fail.