qt:qt.git
5 years agoChange copyrights from Nokia to Digia 4.5
Sergio Ahumada [Thu, 15 Nov 2012 14:53:08 +0000 (15:53 +0100)]
Change copyrights from Nokia to Digia

Change copyrights and license headers from Nokia to Digia

Change-Id: I9f5c8a9135271161e2bce50bc413ea01a08c3a76
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoChange licenses and license headers from Nokia to Digia
Sergio Ahumada [Wed, 14 Nov 2012 20:45:33 +0000 (21:45 +0100)]
Change licenses and license headers from Nokia to Digia

Change copyrights and license headers from Nokia to Digi

Change-Id: Ida81e5b6b8d322a9d8c7739cebd1d324292ceab4
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
8 years agoRemove obsolete URL's.
Jason McDonald [Tue, 9 Mar 2010 05:40:14 +0000 (15:40 +1000)]
Remove obsolete URL's.

Task-number: QT-3051
Reviewed-by: Trust Me
8 years agoFixed bug where GL widget was not fully updated on Vista.
Kim Motoyoshi Kalland [Wed, 3 Feb 2010 12:27:43 +0000 (13:27 +0100)]
Fixed bug where GL widget was not fully updated on Vista.

There were cases where the QGLWidget would not be fully
updated on screen on Windows Vista and Windows 7 with Aero
disabled.

Task-number: QTBUG-7865
Reviewed-by: Prasanth
8 years agotst_qhostinfo benchmark: Fix license header
Markus Goetz [Mon, 4 Jan 2010 15:17:29 +0000 (16:17 +0100)]
tst_qhostinfo benchmark: Fix license header

For some reason, I got it wrong.

Reviewed-by: TrustMe
8 years agoFix D-Bus marshalling of booleans in optimised code.
Thiago Macieira [Sun, 27 Dec 2009 12:55:33 +0000 (10:55 -0200)]
Fix D-Bus marshalling of booleans in optimised code.

C++ booleans are 1 byte in size, but D-Bus booleans (dbus_bool_t) are
4 bytes. That means a boolean with a zero in the LSB byte but non-zero
garbage in the high bytes is a valid "false" in C++, but libdbus-1
will turn that to true when sending.

Task-number: QTBUG-7041
Reviewed-By: Trust Me
BT: yes

8 years agoUse Mono instead of MonoLSB when writing pbm files.
Rhys Weatherley [Wed, 23 Dec 2009 07:15:50 +0000 (17:15 +1000)]
Use Mono instead of MonoLSB when writing pbm files.

PBM files are MSB, not LSB - the pbm reader was correct,
but not the pbm writer.

Task-number: QTBUG-6937
Reviewed-by: Sarah Smith
8 years agoFix memory leak of QGLGlyphCoord objects in the OpenGL1 paint engine
Rhys Weatherley [Sun, 20 Dec 2009 22:35:43 +0000 (08:35 +1000)]
Fix memory leak of QGLGlyphCoord objects in the OpenGL1 paint engine

Task-number: QTBUG-6936
Reviewed-by: Julian de Bhal
8 years agoAdd QHostInfo benchmark
Markus Goetz [Fri, 18 Dec 2009 12:16:04 +0000 (13:16 +0100)]
Add QHostInfo benchmark

Reviewed-by: Peter Hartmann
8 years agoFixed crash when parsing invalid polygons in svgs.
Kim Motoyoshi Kalland [Fri, 18 Dec 2009 09:27:59 +0000 (10:27 +0100)]
Fixed crash when parsing invalid polygons in svgs.

Since a 2D point consists of two coordinates, it was assumed that
polygons and polylines were described with an even number of
coordinates. When the number of coordinates was odd, the program
would read out of bounds and cause an assert failure.

Task-number: QTBUG-6899
Reviewed-by: Gunnar
8 years agofix Cocoa build
Peter Hartmann [Tue, 15 Dec 2009 15:48:03 +0000 (16:48 +0100)]
fix Cocoa build

with change 83940f25, we used LIBS_PRIVATE on the Mac; somewhere
the line where we linked against the Mac libs in the network
kernel was lost.

Reviewed-By: Thiago
8 years agoAdd a mkspec for selecting gcc-4.0 on Mac OS X.
Morten Sorvig [Thu, 10 Sep 2009 06:49:56 +0000 (08:49 +0200)]
Add a mkspec for selecting gcc-4.0 on Mac OS X.

This has one known use case: compiling with the 10.4u SDKi on 10.6.
(cherry picked from commit 855f1705ceb15c303b55fcced8b0303d90352a44)

8 years agoFix crash in QFontDialog::getFont() on Mac 10.4
Morten Johan Sørvig [Wed, 9 Dec 2009 12:36:52 +0000 (13:36 +0100)]
Fix crash in QFontDialog::getFont() on Mac 10.4

[NSFontManager setTarget] is not available on 10.4.

Rev-by: Richard Moe Gustavsen
8 years agoFix crash in QDBusPendingReply/QDBusReply in case of unconnected calls.
Thiago Macieira [Tue, 8 Dec 2009 19:28:45 +0000 (20:28 +0100)]
Fix crash in QDBusPendingReply/QDBusReply in case of unconnected calls.

If we made calls on a QDBusConnection that isn't connected, the d
pointer is 0. Ensure we don't crash.

Task-number: QTBUG-6571
Reviewed-by: Bradley T. Hughes
8 years agoFixed uninitialized background artifacts in QWidget::render.
Donald Carr [Tue, 8 Dec 2009 16:28:43 +0000 (16:28 +0000)]
Fixed uninitialized background artifacts in QWidget::render.

backport of 64d38ba23b4acc46fdb9145f1953315573e3f8dc

Reviewed-by: Anders Bakken<anders.bakken@nokia.com>
8 years agoFixed searching and copy/paste from PDF documents.
axis [Thu, 12 Nov 2009 12:45:41 +0000 (13:45 +0100)]
Fixed searching and copy/paste from PDF documents.

Previously copy and paste from PDFs made by Qt would paste garbage
into the target document, and searching was not possible. The bug
happened because the internal buffer would open its data stream in
truncate mode rather than append mode, thereby losing content, and
producing a slightly corrupted PDF.

Task:     QTBUG-4912
Task:     QTBUG-3661
RevBy:    Trond Kjernåsen
(cherry picked from commit f7ee0c9efcb6cb36a95f49bc998524e25480f8ba)

8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Jason McDonald [Tue, 8 Dec 2009 03:29:15 +0000 (13:29 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agoReplace glColor4ub() calls with glColor4f()
Rhys Weatherley [Sun, 6 Dec 2009 23:38:24 +0000 (09:38 +1000)]
Replace glColor4ub() calls with glColor4f()

Intel Q45/Q43 Express Chipset has problems with glColor4ub()
not updating GL_CURRENT_COLOR correctly.  Replace all references
with calls to glColor4f() instead as it is more likely to be
implemented correctly on all chipsets.

Task-number: QTBUG-6217
Reviewed-by: Sarah Smith
8 years agoFix crash in QVector::reserve when reserving smaller size on a shared vector
Olivier Goffart [Wed, 2 Dec 2009 13:35:09 +0000 (14:35 +0100)]
Fix crash in QVector::reserve when reserving smaller size on a shared vector

This backport part of the commit 480b395bd652a4ac6e3f2

Task-number: QTBUG-6416

8 years agoFixed a potential crash in QDockWidget
Thierry Bastian [Tue, 1 Dec 2009 14:32:43 +0000 (15:32 +0100)]
Fixed a potential crash in QDockWidget

This happened when inserting the gap over a place holder item.

Task-number: QTBUG-6107
Reviewed-by: Gabi
8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Jason McDonald [Tue, 1 Dec 2009 06:05:38 +0000 (16:05 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agomake signal handlers understand QVariant again
Kent Hansen [Fri, 5 Jun 2009 15:38:39 +0000 (17:38 +0200)]
make signal handlers understand QVariant again

Also, issue a warning if a type is not known to the meta-type system.
Backport of 508c9cd681244a5ad566c12733aa70f5bd522b57

Task-number: QTBUG-5060

8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Jason McDonald [Fri, 27 Nov 2009 00:39:02 +0000 (10:39 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agoFixed a crash in the GL engine when trying to draw invalid pixmaps.
Trond Kjernåsen [Thu, 26 Nov 2009 14:47:49 +0000 (15:47 +0100)]
Fixed a crash in the GL engine when trying to draw invalid pixmaps.

Task-number: QTBUG-6226
Reviewed-by: Eskil
8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Jason McDonald [Mon, 16 Nov 2009 15:04:24 +0000 (01:04 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agofix baseline for "backslashes"
Oswald Buddenhagen [Mon, 16 Nov 2009 13:33:35 +0000 (14:33 +0100)]
fix baseline for "backslashes"

this is a windows-only test, so it never failed for the "usual suspects"
...

8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Jason McDonald [Sun, 15 Nov 2009 04:02:24 +0000 (14:02 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agoUpdate known issues.
Jason McDonald [Sat, 14 Nov 2009 05:30:37 +0000 (15:30 +1000)]
Update known issues.

Refer to new bug tracker and remove known issue for VS Integration (as
it has been replaced by the VS Add-in).

Reviewed-by: Trust Me
8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Jason McDonald [Fri, 13 Nov 2009 05:57:16 +0000 (15:57 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agoremove dependency on git line end conversions
Oswald Buddenhagen [Thu, 12 Nov 2009 10:31:15 +0000 (11:31 +0100)]
remove dependency on git line end conversions

consistently use QIODevice::Text

8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Jason McDonald [Thu, 5 Nov 2009 02:04:42 +0000 (12:04 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agoFix retrieval of SQL type "TIME" information for PostgreSQL
Derick Hawcroft [Thu, 5 Nov 2009 00:35:48 +0000 (10:35 +1000)]
Fix retrieval of SQL type "TIME" information for PostgreSQL
PostgreSQL can store/retieve the millisecond part of type "TIME" , so
allow it in the API level.

Task-number: QTBUG-5251
Reviewed-by: Bill King
8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Derick Hawcroft [Thu, 5 Nov 2009 00:22:11 +0000 (10:22 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agoCheck success of query.
Derick Hawcroft [Thu, 5 Nov 2009 00:17:16 +0000 (10:17 +1000)]
Check success of query.
For example a bogus use of setFilter() might cause a query to fail.
Check for this.

Reviewed-by: Bill King
8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Jason McDonald [Wed, 4 Nov 2009 07:51:03 +0000 (17:51 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agoFix memory leak in the Mac accessibility module.
Morten Johan Sørvig [Tue, 3 Nov 2009 14:34:35 +0000 (15:34 +0100)]
Fix memory leak in the Mac accessibility module.

Remove duplicate AXUIElement initialization in QAElment.
(The duplicate code was erroneously merged in with
the cocoa port.)

RevBy: Richard Moe Gustavsen

8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Jason McDonald [Tue, 3 Nov 2009 02:03:18 +0000 (12:03 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agoMerge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.5
Morten Johan Sørvig [Mon, 2 Nov 2009 13:55:31 +0000 (14:55 +0100)]
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agoDisable the move-by-scrolling optimization.
Morten Johan Sørvig [Mon, 2 Nov 2009 13:54:23 +0000 (14:54 +0100)]
Disable the move-by-scrolling optimization.

The current implementation fails when moving the
widget onto an area that has just been exposed
as a part of a window resize operation.

8 years agoFix a freeze in QFileDialog (Mac)
Cédric Luthi [Wed, 26 Aug 2009 11:13:36 +0000 (13:13 +0200)]
Fix a freeze in QFileDialog (Mac)

Running an open file dialog, for example with QFileDialog::getOpenFileName() can lead to a freeze if the user selects a folder, then selects a file in the parent folder and finally confirms the open dialog.

Merge-request: 1327
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Jason McDonald [Mon, 2 Nov 2009 03:04:22 +0000 (13:04 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agoIncrease PowerVR memory alignment from 8 to 32 for SGX systems.
Rhys Weatherley [Sun, 1 Nov 2009 23:10:09 +0000 (09:10 +1000)]
Increase PowerVR memory alignment from 8 to 32 for SGX systems.

Increasing the alignment does not seem to affect MBX.

Back port of 7997279bc22d30bf1d1a30a567bda33ecc9aeb2d

8 years agoThe shipped pvr2d.h/wsegl.h for PowerVR do not work with MBX
Rhys Weatherley [Sun, 1 Nov 2009 23:09:51 +0000 (09:09 +1000)]
The shipped pvr2d.h/wsegl.h for PowerVR do not work with MBX

Reviewed-by: trustme
Back port of 4ae09215de36fcfd17dc6875aca102d784d65012

8 years agoRemove unnecessary PowerVR helper functions
Rhys Weatherley [Sun, 1 Nov 2009 23:09:34 +0000 (09:09 +1000)]
Remove unnecessary PowerVR helper functions

The cross-process memory sharing code never really worked in the
way we needed it to - so remove it until something better comes along.

Reviewed-by: trustme
Back port of 04648b44f0784223122a782320d0b09b5c1e9497

8 years agoMake screen rotation work properly with the PowerVR screen driver
Rhys Weatherley [Sun, 1 Nov 2009 23:09:06 +0000 (09:09 +1000)]
Make screen rotation work properly with the PowerVR screen driver

Task-number: QT-2261
Reviewed-by: Tom
Back port of 75719e4e06882825fe056935d782b4153bf0ac5b

8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Jason McDonald [Fri, 30 Oct 2009 02:22:07 +0000 (12:22 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agoAvoid infinite loop when laying out text with unconvertible chars
Eskil Abrahamsen Blomfeldt [Thu, 29 Oct 2009 16:32:57 +0000 (17:32 +0100)]
Avoid infinite loop when laying out text with unconvertible chars

When the stringToCMap() fails, it can be because it did not have enough
space in the layout, or it can because of other errors. In order to
implement "try-again" processing in a simple way, we had an infinite
loop which assumed that stringToCMap() would always succeed in the
second run (which would be the case if the only possible error was
"not enough space".)

Since there are other possible failures not related to the number of
glyphs, you could easily get into an infinite loop here, e.g. when
laying out text that contains the Byte Order Mark.

The fix changes the implementation to explictly try stringToCMap()
twice at max, and is also how it's implemented in the default
qtextengine.cpp.

Task-number: QTBUG-4680
Reviewed-by: Trond
Conflicts:

src/gui/text/qtextengine_mac.cpp
tests/auto/qtextlayout/tst_qtextlayout.cpp

8 years agoPlug some autorelease pool leaks.
Norwegian Rock Cat [Thu, 29 Oct 2009 13:20:46 +0000 (14:20 +0100)]
Plug some autorelease pool leaks.

Calling QWidget::setCursor() outside of the event loop causes a memory
leak in Cocoa. Adding an autorelease pool plugs it.

Merge-request: 1791
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Jason McDonald [Wed, 28 Oct 2009 04:06:53 +0000 (14:06 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agoMemory of fixedKernel is never returned, found by cppcheck.
Daniël [Fri, 15 May 2009 05:29:29 +0000 (05:29 +0000)]
Memory of fixedKernel is never returned, found by cppcheck.

Cherry-picked from d8a2e52e
Merge-request: 419
Reviewed-by: Olivier
8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Jason McDonald [Fri, 23 Oct 2009 01:44:11 +0000 (11:44 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agoQWidget painting regression on Windows.
Bjørn Erik Nilsen [Thu, 22 Oct 2009 08:46:32 +0000 (10:46 +0200)]
QWidget painting regression on Windows.

Problem occurred on Windows due to a call to repaint() on a top-level
window from setDisabledStyle() in qwidget.cpp. This function is called
whenever a window is blocking. In this particular case the children of
the repainted window are opaque, and should therefore not be repainted,
which also means that the top-level have to subtract the region of the
opaque children when filling the background. This region is cached,
and the problem was that the cached region was wrong. It was wrong
because it was not invalidated properly.

Task: QTBUG-4245
Reviewed-by: Paul
8 years agoQWindowsMobileStyle::drawPrimitive(PE_Frame) background color fixed
Joerg Bornemann [Thu, 22 Oct 2009 09:00:25 +0000 (11:00 +0200)]
QWindowsMobileStyle::drawPrimitive(PE_Frame) background color fixed

The background color of PE_Frame was palette().light() and has been
changed to use palette().background() now. This fixes the autotest
tst_QStyleSheetStyle::task188195_baseBackground for Windows mobile.

Reviewed-by: thartman
8 years agomove default QAbstractButton font setup on Win mobile to QApplication
Joerg Bornemann [Thu, 22 Oct 2009 08:34:44 +0000 (10:34 +0200)]
move default QAbstractButton font setup on Win mobile to QApplication

The original approach of modifying the font for QAbstractButtons in
QWindowsMobileStyle::polish broke the autotest
tst_qstylesheetstyle::fontPropagation.

Reviewed-by: thartman
8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Jason McDonald [Wed, 21 Oct 2009 07:42:29 +0000 (17:42 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agotst_qsslsocket: new bigChunk testcase
Markus Goetz [Tue, 20 Oct 2009 13:03:56 +0000 (15:03 +0200)]
tst_qsslsocket: new bigChunk testcase

This new test is to find out if the BIO size of OpenSSL is limited
or not. The test passes on my Linux, however the OpenSSL docu suggests
that the BIO size is limited.
From http://www.openssl.org/docs/crypto/BIO_s_bio.html
"This is currently 17K".

Reviewed-by: Peter Hartmann
8 years agomake missing Key_Back and Key_Forward menu glyphs return 0 on mac(cocoa)
Dean Dettman [Tue, 20 Oct 2009 10:28:32 +0000 (12:28 +0200)]
make missing Key_Back and Key_Forward menu glyphs return 0  on mac(cocoa)

This is an addition to
commit 5651d2547261ccecbf50f8141c634f59c0adc00d to make it obvious that
in cocoa nothing is returned.

Task-number: QTBUG-4873
Reviewed-by: MortenS
8 years agoMerge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.5
Dean Dettman [Tue, 20 Oct 2009 10:13:52 +0000 (12:13 +0200)]
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agoAdds Key_Back and Key_Forward menu glyphs on mac(carbon)
Dean Dettman [Tue, 20 Oct 2009 09:13:02 +0000 (11:13 +0200)]
Adds Key_Back and Key_Forward menu glyphs on mac(carbon)

This change improves the behavior of QMenu when Key_Back and Key_Forward
are used as shortcuts. A dotted arrow appears on carbon, and
on Cocoa the image is blank, instead of undefined as it was before.

Task-number:     QTBUG-4873
Reviewed-by: msorvig
8 years agoAdd a up/down benchmark to benchmarks/qnetworkreply
Markus Goetz [Mon, 19 Oct 2009 15:16:20 +0000 (17:16 +0200)]
Add a up/down benchmark to benchmarks/qnetworkreply

Reviewed-by: Peter Hartmann
8 years agoBackport benchmarks/qnetworkreply to 4.5
Markus Goetz [Mon, 19 Oct 2009 14:23:47 +0000 (16:23 +0200)]
Backport benchmarks/qnetworkreply to 4.5

Reviewed-by: TrustMe
8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Jason McDonald [Mon, 19 Oct 2009 02:08:01 +0000 (12:08 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agoQNetworkProxyFactory: Never return empty list on windows
Markus Goetz [Thu, 15 Oct 2009 14:35:45 +0000 (16:35 +0200)]
QNetworkProxyFactory: Never return empty list on windows

Task-number: Salesforce 00062670
Reviewed-by: Thiago
8 years agoRecognize transformed screens when looking for a QGLScreen
Rhys Weatherley [Fri, 16 Oct 2009 04:48:59 +0000 (14:48 +1000)]
Recognize transformed screens when looking for a QGLScreen

If the QWS_DISPLAY is specified as "Transformed:powervr:...",
then we will encounter QScreen::TransformedClass rather than
QScreen::ProxyClass when searching for the QGLScreen.  This change
makes the code search for both.

Task-number: QT-2261
Reviewed-by: Sarah Smith
Back port of 8e4fa6e87f74cfb3457e8270a361cf30ca7d3593

8 years agoSome sub menus are disabled in Cocoa
Prasanth Ullattil [Thu, 15 Oct 2009 12:47:35 +0000 (14:47 +0200)]
Some sub menus are disabled in Cocoa

The commit faec535829a0e454a6784b0c5c37cb63e7da8f73 introduced this bug.
Since we can add a submenu to the same supermenu, we should consider it
before disabling the submenu who already have a supermenu.

Reviewed-by: MortenS
8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt-releases into 4.5
Jason McDonald [Thu, 15 Oct 2009 04:18:39 +0000 (14:18 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt-releases into 4.5

8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Jason McDonald [Thu, 15 Oct 2009 04:01:41 +0000 (14:01 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agoRemove the surface holder from the PowerVR screen driver
Rhys Weatherley [Thu, 15 Oct 2009 00:50:57 +0000 (10:50 +1000)]
Remove the surface holder from the PowerVR screen driver

The PvrEglSurfaceHolder is a hold-over from Qtopia that isn't
needed any more and was never very stable anyway.

Reviewed-by: trustme
Back port of f613b0170d0fe806378779472315d0bbdc1aada9

8 years agoBack-port several OpenGL/ES fixes from 4.6 to 4.5
Rhys Weatherley [Thu, 15 Oct 2009 00:44:27 +0000 (10:44 +1000)]
Back-port several OpenGL/ES fixes from 4.6 to 4.5

8ee6d090d45198fb2530849236c97f014666b7e4: fix EGL_SAMPLES
b125af1b298d694c332f56deebe4755d0c985d5d: memory leak of EGLSurface's
ef8d9fa7091b0d45fe15aae43b8f1c47547cb16d: double-destroy of pbuffer
73d9dced8298dfad7bc72607146e81e96fffb6d4: suppress pbuffer warnings

Reviewed-by: Donald Carr
8 years agoQNAM HTTP Code: Backport a fix related to aborting replies
Markus Goetz [Wed, 14 Oct 2009 08:39:05 +0000 (10:39 +0200)]
QNAM HTTP Code: Backport a fix related to aborting replies

Backport af71faf8cb2c9cbf34c408b81ce7ae1ef6c6403e from 4.6 to
4.5.

Task-number: 261999
Reviewed-by: Peter Hartmann
8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Jason McDonald [Tue, 13 Oct 2009 14:09:19 +0000 (00:09 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agoFix regression while updating items in itemview.
Olivier Goffart [Tue, 13 Oct 2009 08:08:27 +0000 (10:08 +0200)]
Fix regression while updating items in itemview.

geometry() is in parent coordinate. We want the coordinate in viewport
coordinate.
There is an offset (the header geometry) between the two.

So the first item was not refreshed.

(Regression because of e5b32fbe0efc8 and a54c18e27bbb)

Reviewed-by: Gabriel
Reviewed-by: Alexis
Task-number: QTBUG-4849

8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Jason McDonald [Tue, 13 Oct 2009 03:48:11 +0000 (13:48 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agoFix a crash in cocoa when a QMessageBox is destroyed from dropEvent()
Prasanth Ullattil [Mon, 12 Oct 2009 11:44:14 +0000 (13:44 +0200)]
Fix a crash in cocoa when a QMessageBox is destroyed from dropEvent()

The gobal variable which stores the current mouse event can be updated
before dragImage() call(blocking) is finished. So make a local copy of
the information required by the QDragManager::drag().

Task-number: QTBUG-4814
Reviewed-by: MortenS
8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Jason McDonald [Mon, 12 Oct 2009 10:27:10 +0000 (20:27 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agoBack port fixes from PowerVR driver in 4.6 to 4.5
Rhys Weatherley [Fri, 9 Oct 2009 01:02:57 +0000 (11:02 +1000)]
Back port fixes from PowerVR driver in 4.6 to 4.5

Pre-multiply fix: 01a671ff0bd380e5cff311cc233352c867a041a0
Painting performance: c3cfba7295c990d8135e1dd70b8cdbefd25615ab

8 years agoFix detection of pbuffers on OpenGL/ES systems
Rhys Weatherley [Fri, 9 Oct 2009 00:54:33 +0000 (10:54 +1000)]
Fix detection of pbuffers on OpenGL/ES systems

The previous code was searching for an exact pbuffer format of
RGBA = 1, 1, 1, 0, which of course is never going to happen.
Instead, search for the best format.

Reviewed-by: trustme
Conflicts:

src/opengl/qglpixelbuffer_egl.cpp

Back-port of 46843022acd7322c42a98858ec52b65ce7451d06

8 years agoQHeaderView: fixed the sizeHint with hidden sections
Thierry Bastian [Fri, 3 Jul 2009 14:40:32 +0000 (16:40 +0200)]
QHeaderView: fixed the sizeHint with hidden sections

We used to check the 100 first sections and 100 last sections
Now we make sure we check 100 visible sections

Task-number: 255574

8 years agoignore invalid WM_KEYDOWN messages on Windows
Joerg Bornemann [Wed, 7 Oct 2009 13:52:59 +0000 (15:52 +0200)]
ignore invalid WM_KEYDOWN messages on Windows

For some strange reason, I get the following message if I press a
non-numerical key on the SIP of a Samsung Omnia device, running Windows
mobile 6.1:

WM_KEYDOWN
wParam == 0
lParam == 1

That message is invalid. We must ignore it.

Reviewed-by: mauricek
8 years agofix ts and qm targets under windows
Oswald Buddenhagen [Wed, 7 Oct 2009 10:01:06 +0000 (12:01 +0200)]
fix ts and qm targets under windows

8 years agoFix ASSERT caused by Plastique style when setting an application font with a pixel...
Bradley T. Hughes [Wed, 7 Oct 2009 09:48:08 +0000 (11:48 +0200)]
Fix ASSERT caused by Plastique style when setting an application font with a pixel size

Use QFontInfo to query the pointSize() instead of asking the font
directly, fixing this assert:

ASSERT failure in QFont::setPointSize: "point size must be greater than 0", file text/qfont.cpp, line 855

Task-number: QTBUG-3555
Reviewed-by: Simon Hausmann
8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Jason McDonald [Wed, 7 Oct 2009 02:04:33 +0000 (12:04 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agoAutotest: add a few more tests, with IP address and actual hostname
Thiago Macieira [Tue, 6 Oct 2009 18:51:18 +0000 (20:51 +0200)]
Autotest: add a few more tests, with IP address and actual hostname

8 years agoAutotest: use port 12346 instead of 1, to ensure that it's not a
Thiago Macieira [Tue, 6 Oct 2009 18:47:52 +0000 (20:47 +0200)]
Autotest: use port 12346 instead of 1, to ensure that it's not a
firewall issue

Also check if we're not timing out instead of being able to fail.

8 years agotst_QGraphicsItem::QTBUG_4233_updateCachedWithSceneRect WinCE fix
Joerg Bornemann [Tue, 6 Oct 2009 09:44:21 +0000 (11:44 +0200)]
tst_QGraphicsItem::QTBUG_4233_updateCachedWithSceneRect WinCE fix

We need some more time on Windows mobile to receive all events.

Reviewed-by: thartman
8 years agotst_QGraphicsView::task245469_itemsAtPointWithClip Windows mobile fix
Joerg Bornemann [Tue, 6 Oct 2009 09:38:02 +0000 (11:38 +0200)]
tst_QGraphicsView::task245469_itemsAtPointWithClip Windows mobile fix

We must make sure that the graphics view scene is centered to make
this test work. On Windows mobile, the widget was too wide and the
scene wasn't centered.

Reviewed-by: thartman
8 years agotst_QGraphicsLinearLayout::layoutDirection fixed for Windows mobile
Joerg Bornemann [Tue, 6 Oct 2009 09:08:42 +0000 (11:08 +0200)]
tst_QGraphicsLinearLayout::layoutDirection fixed for Windows mobile

This test depends on a layout spacing set to 6.
The Windows mobile style has layout spacing 8.

Reviewed-by: mauricek
8 years agoAutotest: disable the globalObjects test.
Thiago Macieira [Tue, 6 Oct 2009 09:04:57 +0000 (11:04 +0200)]
Autotest: disable the globalObjects test.

We are not going to fix this in 4.5. I doubt we'll fix it in 4.6
either, so I'll reenable it for 4.7 only.

8 years agotst_QCssParser::extractFontFamily fix Windows CE font deployment
Joerg Bornemann [Tue, 6 Oct 2009 05:34:12 +0000 (07:34 +0200)]
tst_QCssParser::extractFontFamily fix Windows CE font deployment

On Windows mobile we usually don't have the "Times New Roman" font.
Thus we must deploy and register it, if its not available.

Reviewed-by: mauricek
8 years agofix tst_QAbstractItemView::task250754_fontChange for Windows CE
Joerg Bornemann [Tue, 6 Oct 2009 04:55:34 +0000 (06:55 +0200)]
fix tst_QAbstractItemView::task250754_fontChange for Windows CE

We need to give Windows mobile some more time to handle all internal
timer events. Otherwise QTreeView::updateScrollBars doesn't get called.

Reviewed-by: mauricek
8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Jason McDonald [Tue, 6 Oct 2009 01:56:02 +0000 (11:56 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agoFixing the autotest for other platforms, hopefully...
João Abecasis [Mon, 28 Sep 2009 13:48:48 +0000 (15:48 +0200)]
Fixing the autotest for other platforms, hopefully...

Reviewed-by: Joerg Bornemann
8 years agotst_QComboBox::task248169_popupWithMinimalSize() fixed for WinCE
ninerider [Thu, 24 Sep 2009 08:39:10 +0000 (10:39 +0200)]
tst_QComboBox::task248169_popupWithMinimalSize() fixed for WinCE

Changed the absolute size values for the combobox to desktop
dependent sizes.

Reviewed-by: Joerg
8 years agoBump version number of 4.5 branch to 4.5.4.
Jason McDonald [Mon, 5 Oct 2009 11:44:57 +0000 (21:44 +1000)]
Bump version number of 4.5 branch to 4.5.4.

Reviewed-by: Trust Me
8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Jason McDonald [Mon, 5 Oct 2009 11:08:53 +0000 (21:08 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agoFix regressions in qeventloop, qtimer, and qsocketnotifier autotests
Bradley T. Hughes [Wed, 23 Sep 2009 11:51:17 +0000 (13:51 +0200)]
Fix regressions in qeventloop, qtimer, and qsocketnotifier autotests

Commit ed375675d4a4f6fd63edeb242e23c87b3de4be6f triggers a behavior in
Glib's mainloop implementation where some event sources are not
"serviced" every iteration of the mainloop context. This breaks an
invariant that many tests relied on, so we need to solve the problem.

The invariant is that a newly added timer that would normally fire on
the next pass of the event loop (liker a zero timer) SHOULD actually
fire. We do this by registering 2 timer event sources with Glib's
mainloop: one normal priority source and one idle priority source. The
idle priority source is the one that will send events most of the
time, with the normal priority one taking over only when
processEvents() is called manually.

Task-number: QT-877
Reviewed-by: jbache
Reviewed-by: thiago
Reviewed-by: denis
(cherry picked from commit d0d0fdb8e46351b4ab8492de31e5363ef6662b57)

8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Jason McDonald [Mon, 5 Oct 2009 03:21:35 +0000 (13:21 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agoFix a bug when clipsChildrenToShape is set back to false.
Alexis Menard [Fri, 2 Oct 2009 09:33:40 +0000 (11:33 +0200)]
Fix a bug when clipsChildrenToShape is set back to false.

If you set the flag itemClipsChildrenToShape to true on a parent, an
optimization was made in 4.5.0 to not add children of this parent in
the index. But when you set the flag back to false all the sub-tree
of the parent should be re-added to the index otherwise the index will
never find all children. This code is not relevant for 4.6 since
the index part of QGraphicsView has been refactored and handle this case
with itemChange in QGraphicsSceneIndex.

Reviewed-by:andreas

8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Jason McDonald [Fri, 2 Oct 2009 05:21:10 +0000 (15:21 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agoFix support for 32-bit PowerVR screens with QGraphicsView
Rhys Weatherley [Fri, 2 Oct 2009 00:31:39 +0000 (10:31 +1000)]
Fix support for 32-bit PowerVR screens with QGraphicsView

When QGLWidget was used as a viewport for QGraphicsView, it was
still treating the window surface as RGB16.  Use the screen's actual
pixel format.

Also ensure that PvrEglWindowSurface::image() returns a non-null
QImage if the drawable hasn't been created yet.

Reviewed-by: trustme
Back port of 53b3a0572242d0a425e74848afba1293f195d29b