8 years agoRemove mentions of QtSW. v4.5.3
Jason McDonald [Tue, 29 Sep 2009 09:13:30 +0000 (19:13 +1000)]
Remove mentions of QtSW.

Reviewed-by: Trust Me
(cherry picked from commit aa65b608b96f0b41e96093e6eb26ccc0f301afc9)

8 years agoRemove mention of QtSW.
Jason McDonald [Tue, 29 Sep 2009 09:07:01 +0000 (19:07 +1000)]
Remove mention of QtSW.

Reviewed-by: Trust Me
(cherry picked from commit 36623ef3b5d3804de2ced689af2329c9ab81c265)

8 years agoTidy the changes file for 4.5.3.
Jason McDonald [Tue, 29 Sep 2009 04:56:46 +0000 (14:56 +1000)]
Tidy the changes file for 4.5.3.

Reviewed-by: Trust Me
8 years agoUpdate changes file for 4.5.3 for DirectFB
Anders Bakken [Fri, 25 Sep 2009 16:25:22 +0000 (09:25 -0700)]
Update changes file for 4.5.3 for DirectFB

Reviewed-by: TrustMe
(cherry picked from commit 390c40d7d2bbc622e18aa1c096d0b5fee5a04344)

8 years agoAdded my 4.5.3 changes to changelog.
Samuel Rødal [Mon, 28 Sep 2009 17:26:47 +0000 (19:26 +0200)]
Added my 4.5.3 changes to changelog.
(cherry picked from commit 9167aabca46c46dff0630cfc349f777211734219)

8 years agoMac: build issue (autotest stalls build)
Richard Moe Gustavsen [Mon, 28 Sep 2009 13:07:24 +0000 (15:07 +0200)]
Mac: build issue (autotest stalls build)

When building Qt static on Mac, the test included actually stops
the build process, prompting the user for 'Promteroo?'
The reason is that configure runs qmake on all the tests inside
the test/auto directory, including the one that is meant for
testing qmake itself. In other words, this test should not
be qmake'ed when running configure, only when running the
qmake auto test. However, the qmake auto test does not run
the prompt test anymore either. So the solution for now
is to just comment out the test project as well.

Reviewed-by: alexis
(cherry picked from commit 62624c575bd784b36b1d080d32f168e0668ca15b)

8 years agoMac: backport efd84105355 to silence visibility warnings
Richard Moe Gustavsen [Mon, 28 Sep 2009 12:56:03 +0000 (14:56 +0200)]
Mac: backport efd84105355 to silence visibility warnings

Make sure that we build objective c files with visibility
hidden as default

Reviewed-by: prasanth
(cherry picked from commit b798fc523446b4b7c7e888f7ef504202730e6cb5)

8 years agoQGraphicsItem with parent flag ItemClipsChildrenToShape not visible
Andreas Aardal Hanssen [Mon, 28 Sep 2009 12:24:38 +0000 (14:24 +0200)]
QGraphicsItem with parent flag ItemClipsChildrenToShape not visible

Regression against Qt 4.4. Children of items with ItemClipsChildrenToShape
would only be discovered if the view's expose region contained the outer
bounding rect of all items, _if_ there was at least one item in the
scene that enabled ItemIgnoresTransformations.

The reason for this bug is that the presence of an untransformable item
causes the item lookups to go through a different path
(QGraphicsViewPrivate::itemsInArea()). This function had the bug that it
didn't correctly discover children of clip-items. Because of this, in
the provided test case you could "work around" the bug by either removing
the clip flag, or the transformation flag.

Task-number: QTBUG-4151
Reviewed-by: Alexis
(cherry picked from commit f9d6862d13ae38c59ec4a58092c8126620801e0b)

8 years agoSome of my 4.5.3 changes
Markus Goetz [Mon, 28 Sep 2009 10:46:00 +0000 (12:46 +0200)]
Some of my 4.5.3 changes

Reviewed-by: TrustMe
(cherry picked from commit f85545a53bae8cbfbc0192d4730d181d7525a65d)

8 years agomy changes for 4.5.3 added
Joerg Bornemann [Mon, 28 Sep 2009 09:41:17 +0000 (11:41 +0200)]
my changes for 4.5.3 added
(cherry picked from commit a8ef13fa6feafc63ef4d571c95287ac66afc5825)

8 years agoCocoa: Fix build cocoa port with namespace
Richard Moe Gustavsen [Mon, 28 Sep 2009 08:43:10 +0000 (10:43 +0200)]
Cocoa: Fix build cocoa port with namespace

This fix just fixes up coding bugs here and there

Reviewed-by: Brad
(cherry picked from commit ce94e9575a9f623f599a16d69051480a94300b7e)

8 years agoUpdated change log for 4.5.3
João Abecasis [Mon, 28 Sep 2009 08:41:51 +0000 (10:41 +0200)]
Updated change log for 4.5.3
(cherry picked from commit 003d454ce8350cc279c2de53848c7a4533dc939d)

8 years agoDoc: fixed typo in QTabBar::tabRect() docs
Stian Sandvik Thomassen [Mon, 28 Sep 2009 03:49:54 +0000 (13:49 +1000)]
Doc: fixed typo in QTabBar::tabRect() docs
(cherry picked from commit c2f946034bb68b7dbf508ac640d692066821a400)

8 years agoFixes: better wording.
Bill King [Mon, 28 Sep 2009 03:11:44 +0000 (13:11 +1000)]
Fixes: better wording.
(cherry picked from commit 75e19e6165229db5465704bf14d8e938c3f0c36d)

8 years agoUpdate dist/changes-4.5.3 for sql changes.
Bill King [Mon, 28 Sep 2009 00:03:56 +0000 (10:03 +1000)]
Update dist/changes-4.5.3 for sql changes.
(cherry picked from commit 8c3169c487fc863c59b58699b3c570cde3a37bd9)

8 years agoFixes a crash in QDoubleSpinBox
João Abecasis [Wed, 3 Jun 2009 10:04:56 +0000 (12:04 +0200)]
Fixes a crash in QDoubleSpinBox

Removing dubious intermediate detection code that also had a buffer
overflow.  The results were inconsistent and not dependable on.
Processing was inefficient and end value to user experience dubious.

Test cases that abused the former behaviour were changed to consider
input in an Intermediate where it was previously considered Invalid.

With this change, user input will mostly be considered in an
intermediate state, until it is effectively validated.

Task-number: 255019
Reviewed-by: Anders Bakken
(cherry picked from commit c5acc6ee80d9f429fc8f4d9dd3cca51f3efdf6d5)

8 years agoChange log update
Prasanth Ullattil [Fri, 25 Sep 2009 11:02:34 +0000 (13:02 +0200)]
Change log update

Reviewed-by: Trust me
(cherry picked from commit 101af7f0dc2eb8554a911ccb4c80ad0966db5780)

8 years agoQHostAddress: Clarification about DNS
Markus Goetz [Fri, 25 Sep 2009 10:11:57 +0000 (12:11 +0200)]
QHostAddress: Clarification about DNS

Task-number: QT-1683
(cherry picked from commit e4b6d83ae9c060805d630f94f97447655b2e78ed)

8 years agoAdd Russian translation for Qt Designer
Ritt Konstantin [Fri, 25 Sep 2009 08:35:47 +0000 (10:35 +0200)]
Add Russian translation for Qt Designer

Merge-request: 1611
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit feec449d63c355dd465dea7674d43923e999911e)

8 years agoUpdate Russian translations for Qt Assistant and Qt Assistant_adp tools
Ritt Konstantin [Fri, 25 Sep 2009 08:35:46 +0000 (10:35 +0200)]
Update Russian translations for Qt Assistant and Qt Assistant_adp tools

Merge-request: 1611
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit b779e38ef18fa3a16ba60bfe85aac650e3696962)

8 years agoUpdate Russian translations for QtHelp library
Ritt Konstantin [Fri, 25 Sep 2009 08:35:45 +0000 (10:35 +0200)]
Update Russian translations for QtHelp library

Merge-request: 1611
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit e529fc93a203307c1cc9decbd364b8c103c048c1)

8 years agoUpdate Russian translations for Qt Linguist
Ritt Konstantin [Fri, 25 Sep 2009 08:35:44 +0000 (10:35 +0200)]
Update Russian translations for Qt Linguist

Merge-request: 1611
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 587704316bcb4e0ad55b0dc84af127fb0c9b5828)

8 years agoUpdate Russian translations for QtConfig
Ritt Konstantin [Fri, 25 Sep 2009 08:35:43 +0000 (10:35 +0200)]
Update Russian translations for QtConfig

Merge-request: 1611
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit d6226445ffd06372f000cccda7917c2adbd92412)

8 years agoUpdate Russian translations for QVFB
Ritt Konstantin [Fri, 25 Sep 2009 08:35:43 +0000 (10:35 +0200)]
Update Russian translations for QVFB

Merge-request: 1611
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit c0d420b589faa200f4cbf5fd09597812efae0e77)

8 years agoUpdate Russian translations for Qt libraries
Ritt Konstantin [Fri, 25 Sep 2009 08:35:42 +0000 (10:35 +0200)]
Update Russian translations for Qt libraries

Merge-request: 1611
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 69d6ba21297c48af98dfdc32acb4ef7ccd7bb6f8)

8 years agoUpdate Russian phrasebook
Ritt Konstantin [Fri, 25 Sep 2009 08:35:41 +0000 (10:35 +0200)]
Update Russian phrasebook

Merge-request: 1611
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 7a2b606e8c1c5704d3b9d018deeefe5bd7800906)

8 years agoCalling raise() on a hidden windows makes it visible on Cocoa.
Prasanth Ullattil [Wed, 23 Sep 2009 10:42:58 +0000 (12:42 +0200)]
Calling raise() on a hidden windows makes it visible on Cocoa.

[NSWindow orderFront:] on a hidden window will make it visible. So
raise_sys() will now check if window is visible before this method is

Task-number: 255428
Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit 9262ee16906fd8e030cd5d2a81d22fe9b791b9f6)

8 years agoSet the QMAKE_BUNDLE_LOCATION to 'Contents/MacOS' only if it's not set
Tor Arne Vestbø [Mon, 10 Aug 2009 16:04:59 +0000 (18:04 +0200)]
Set the QMAKE_BUNDLE_LOCATION to 'Contents/MacOS' only if it's not set

This matches the logic for the 'lib' template to the one for 'app'.
(cherry picked from commit 9e4f5f2133b542cdf6f32f2fc96dccd864e68420)

8 years agoFixed text drawing regression in Assistant.
Trond Kjernåsen [Thu, 24 Sep 2009 12:51:53 +0000 (14:51 +0200)]
Fixed text drawing regression in Assistant.

Revert parts of adf322c514a5781dcb9ec304d44229fa47d5e8b3 to
get this to work as in 4.5.2 again. What the original
patch fixed, we don't really know..

Reviewed-by: Simon Hausmann
(cherry picked from commit d04c169e424c0feee61763764e841ef132ba359f)

8 years agoRevert "Autotest: This test does requires internal builds (with autotests)."
Joerg Bornemann [Thu, 24 Sep 2009 08:53:30 +0000 (10:53 +0200)]
Revert "Autotest: This test does requires internal builds (with autotests)."

This reverts commit df47e0d40290f5e40054a9612f75177d9ef8537a.
There is no "private_build" in Qt 4.5

Reviewed-By: thiago
(cherry picked from commit 600cef0aa62dedafac9190809230e01e3b200356)

8 years agoAutotest: This test does requires internal builds (with autotests).
Thiago Macieira [Wed, 23 Sep 2009 12:51:23 +0000 (14:51 +0200)]
Autotest: This test does requires internal builds (with autotests).

Reviewed-By: TrustMe
(cherry picked from commit df47e0d40290f5e40054a9612f75177d9ef8537a)

8 years agoTry to support Qt 4.4-style Phonon includes in Qt.
Thiago Macieira [Wed, 23 Sep 2009 12:35:06 +0000 (14:35 +0200)]
Try to support Qt 4.4-style Phonon includes in Qt.

This introduces an undocumented "phonon_compat" subdir and also adds
it to the INCLUDEPATH when QT += phonon is specified. With this, these
styles of #includes should be supported:

 #include <Phonon>
 #include <Phonon/Phonon>
 #include <phonon>
 #include <phonon/phonon>
 #include <Phonon/MediaObject>
 #include <phonon/mediaobject.h>

Still need to check if the headers get installed during "make
install". I couldn't find where in our code that is done.

BT: yes
Reviewed-By: Trust Me
(cherry picked from commit 0cb5038a3e5d3a6b0c33d081b89c6fe47cfc0b1b)
(cherry picked from commit 94ffd7e298a4ffa0440fd18a30b1823a71c6bb77)

8 years agoPaint arrow on top of node, not underneath it
Eskil Abrahamsen Blomfeldt [Wed, 23 Sep 2009 08:22:49 +0000 (10:22 +0200)]
Paint arrow on top of node, not underneath it

It looked strange that the node and its drop shadow was painted on top
of the arrow. Flip the z-axis around to make sure the arrow is painted
on top.

Task-number: QTBUG-4544
Reviewed-by: Gunnar
(cherry picked from commit 33d104723a02297ffef53020d42b789284699534)

8 years agoMake sure fontextractor example is found by qtdemo
Eskil Abrahamsen Blomfeldt [Wed, 23 Sep 2009 08:12:24 +0000 (10:12 +0200)]
Make sure fontextractor example is found by qtdemo

Qt Demo seems to assume the executable name is the same as the
directory name, so change the name to all lower case to avoid getting
the message that the example has not been built even when it has.

Found by Black Team.
(cherry picked from commit 6d3764ee563db117d03b9c759e491b70a3c1df7d)

8 years agoEnsure that QStandardItem::clone() is used when a prototype is set
Andy Shaw [Tue, 22 Sep 2009 12:38:09 +0000 (14:38 +0200)]
Ensure that QStandardItem::clone() is used when a prototype is set

This fixes a regression introduced in Qt 4.5.0, when dragging an item
within a QTreeView it would not call clone() when it was dropped even if
a prototype was set on the QStandardItemModel.

Reviewed-by: Marius Bugge Monsen
(cherry picked from commit e410d2711ae2aba15b9da7b07a4f8e40a50ab9c5)

8 years agoFix broken drop-down arrows on Windows 7
Jens Bache-Wiig [Tue, 22 Sep 2009 10:38:56 +0000 (12:38 +0200)]
Fix broken drop-down arrows on Windows 7

This issue affects both tool buttons and buttosn
with menus. The problem is that the Windows metric
we were using to calculate the size changed on
Windows 7. It seems not to be the correct metric so it
seems more reliable to use the dpi-scaled constant 12 as we
were doing in common style already. This should make appearance
consistent between the windows versions.

Task-number: QTBUG-4241
Reviewed-by: denis
(cherry picked from commit 1053d8564ca33e18a813e0f0fa1ec1f381e4a937)

8 years agoCached clip path not cleared correctly for ancestor that clips to shape
Andrew Christian [Thu, 17 Sep 2009 16:31:00 +0000 (12:31 -0400)]
Cached clip path not cleared correctly for ancestor that clips to shape

Fix QGraphicsItem to clear clip path for items with an ancestor that
clips to shape.  Added autotest to demonstrate clipping path problem.

Merge-request: 810
Reviewed-by: Alexis
Reviewed-by: Andreas
(cherry picked from commit d14fd301314bcceaf2594a5a18f6d20894c1d353)

8 years agoQCoreApplicationPrivate::appendApplicationPathToLibraryPaths WinCE fix
Joerg Bornemann [Mon, 21 Sep 2009 14:03:39 +0000 (16:03 +0200)]
QCoreApplicationPrivate::appendApplicationPathToLibraryPaths WinCE fix

On Windows CE the plugin path is likely to be the same as the
application directory. That's why we must not compare app_location
with the plugins path.
The check app_libpaths->contains(app_location) should be enough.

Autotest: tst_QApplication::libraryPaths
Reviewed-by: thartman
(cherry picked from commit c8816c6da9d265e5ccbf0385280556f9b4c521f6)

8 years agoAdd INSTALL file.
Jason McDonald [Mon, 21 Sep 2009 05:15:21 +0000 (15:15 +1000)]
Add INSTALL file.

Previously a different version of this file was added to each source
package.  As the file is now the same for all source packages, it can be
added to the repo.

Reviewed-by: Trust Me
(cherry picked from commit 0d3738134f1797a18475fa043751c168eabb48e8)

8 years agoFix broken .ui file - class name was not specified correctly.
Rhys Weatherley [Thu, 17 Sep 2009 22:33:22 +0000 (08:33 +1000)]
Fix broken .ui file - class name was not specified correctly.

Reviewed-by: trustme
(cherry picked from commit 39ec3f66db65684b32b8c5f35311d6045135c4d0)

8 years agoDesigner: tab order in DeviceProfileDialog corrected
Joerg Bornemann [Thu, 17 Sep 2009 11:53:36 +0000 (13:53 +0200)]
Designer: tab order in DeviceProfileDialog corrected

Reviewed-by: Friedemann Kleint
(cherry picked from commit ddf9e97d6700b78711632d352f84c469d000f97b)

8 years agoApplication crashes when a menu is inserted twice on a menubar (Cocoa).
Prasanth Ullattil [Fri, 18 Sep 2009 11:38:26 +0000 (13:38 +0200)]
Application crashes when a menu is inserted twice on a menubar (Cocoa).

Cocoa does not allow NSMenu to have multiple supermenu's. If a menu is
added again as submenu, Qt will now disable the menu item or the menu
will not be added at all if it is added again to the menubar.

Task-number: 258822
Reviewed-by: MortenS
(cherry picked from commit faec535829a0e454a6784b0c5c37cb63e7da8f73)

8 years agoFix compilation for systems with MBX PowerVR headers.
Rhys Weatherley [Thu, 17 Sep 2009 22:09:53 +0000 (08:09 +1000)]
Fix compilation for systems with MBX PowerVR headers.

Reviewed-by: trustme
(cherry picked from commit 9a712c48fb8047c3ed833db7d47382eb072711d6)

8 years agoMake the PowerVR screen driver for QWS compile against shipped headers
Tom Cooksey [Thu, 17 Sep 2009 13:39:59 +0000 (15:39 +0200)]
Make the PowerVR screen driver for QWS compile against shipped headers

The pvr2d.h/wsegl.h headers we ship with Qt (in src/3rdparty/powervr)
are meant for the PowerVR SGX. However, we use an MBX-specific define in
the powervr driver.

Reviewed-by: Jørgen Lind
(cherry picked from commit a62506aae40ede3fd8030312321759f669458909)

8 years agocompile fix for embedded Linux and defined QT_COORD_TYPE
Takumi ASAKI [Thu, 17 Sep 2009 11:30:18 +0000 (13:30 +0200)]
compile fix for embedded Linux and defined QT_COORD_TYPE

If we define QT_COORD_TYPE, src/testlib doesn't compile for embedded

Reviewed-By: joerg
(cherry picked from commit 5a29ceba42840add7a1dcf205c76e39065bee18d)

8 years agoFix crash or painting error when drawing dashed lines with penWidth > 1
Eskil Abrahamsen Blomfeldt [Thu, 17 Sep 2009 08:21:49 +0000 (10:21 +0200)]
Fix crash or painting error when drawing dashed lines with penWidth > 1

Since the width is multiplied into the dash, it needs to be divided out,
otherwise you can get a dashOffset which is greater than the pattern at
the index, and the dash can become negative. This will in turn lead to
passing a negative width to the rasterizer, which at some point will
get cast to an unsigned int and overflow. Depending on the position of
the line and size of the buffer, this will either crash or produce
garbled output.

Task-number: QT-4444
Reviewed-by: Samuel
(cherry picked from commit 603c423fc2ee2b9393e3c288e76354de0e0c1cc7)

8 years agoUpdate qt eclipse integration version number in docs, fix paths.
Jarek Kobus [Thu, 17 Sep 2009 07:56:01 +0000 (09:56 +0200)]
Update qt eclipse integration version number in docs, fix paths.
(cherry picked from commit 9cef27f506e15681f9935a1c00c9df3c6271d5f2)

8 years agoFixes issue of forward only datasets failing when not set so.
Bill King [Thu, 17 Sep 2009 03:15:40 +0000 (13:15 +1000)]
Fixes issue of forward only datasets failing when not set so.

Previously you had to set forward only on non-scrollable datasets
explicitly. This queries ODBC, to determine if it's a scrollable
dataset, and sets forwardOnly to false if it isn't.

Task-number: QT-353
Reviewed-by: Justin McPherson
(cherry picked from commit 18c0fec3afba909faa341c766f31d679892021db)

8 years agoFixed the qkeysequence::translated autotest.
Kim Motoyoshi Kalland [Wed, 16 Sep 2009 14:00:19 +0000 (16:00 +0200)]
Fixed the qkeysequence::translated autotest.

The test failed because it tried to open a .qm file which didn't exist
in Qt's translations directory. Fixed by running lrelease on the .ts
file and copying the resulting .qm into the test directory.

Reviewed-by: Trond
(cherry picked from commit 59dbb1b7e737713fc650c25a20967ec26cc3ff3d)

8 years agoDisabled the qtwidgets test for the times being.
Trond Kjernaasen [Wed, 16 Sep 2009 11:39:06 +0000 (13:39 +0200)]
Disabled the qtwidgets test for the times being.

Reviewed-by: Jesper
(cherry picked from commit 93df7f3b8e0e29ee7ed75a5f54222f26387cc793)

8 years agoFixed the QThread tests for Windows.
Trond Kjernaasen [Wed, 16 Sep 2009 11:22:25 +0000 (13:22 +0200)]
Fixed the QThread tests for Windows.

Backported d04d67e146bce3d407f992c283d7ab3d0c25d428 and
08b54f274d57e4735d0042e295237f176506433d from 4.6.
(cherry picked from commit 706028b5684de47addcf580599df5fad1b0cd6a3)

8 years agoFixed QImageReader autotests.
Trond Kjernaasen [Wed, 16 Sep 2009 11:08:51 +0000 (13:08 +0200)]
Fixed QImageReader autotests.

Reviewed-by: Kim
(cherry picked from commit d851010a10c9a75fd8fb165bc239d5d3b805c0b8)

8 years agoFix drawing text in QPicture and printing in right-to-left mode
Eskil Abrahamsen Blomfeldt [Tue, 15 Sep 2009 13:22:10 +0000 (15:22 +0200)]
Fix drawing text in QPicture and printing in right-to-left mode

Change 979d1d3bbc0c68789edbe93f03464d41d7a8469a requires
qt_format_text() to honor the Qt::TextForceLeftToRight flag. Without
this, the text will be laid out RTL twice, and the output will be
broken. Since printing is done through QPicture, this fixes printing
when the UI is reversed.

Task-number: 261033
Reviewed-by: Trond
(cherry picked from commit 72fc24222ab7f89dc9e606e315ebfb134ba157a8)

8 years agoFixes QSqlTableModel: trying to delete the wrong row.
Bill King [Mon, 14 Sep 2009 06:45:26 +0000 (16:45 +1000)]
Fixes QSqlTableModel: trying to delete the wrong row.

Uses the primary key from the index in the query, not the resulting
location in the modified dataset.

Task-number: 222678
(cherry picked from commit e6f191185d0a80ced3434a8b378b139386c43760)

8 years agoFixes crash when calling numRows on unknown query type (ibase)
Bill King [Mon, 14 Sep 2009 06:39:26 +0000 (16:39 +1000)]
Fixes crash when calling numRows on unknown query type (ibase)

Reviewed-by: Justin McPherson
(cherry picked from commit b2d7bcf1e77e8b9bc8fc1b40777907d7a8d47c09)

8 years agoFixed off-by-one error in call to XGetKeyboardMapping that meant that max_keycode...
Thomas Sondergaard [Mon, 14 Sep 2009 12:33:39 +0000 (14:33 +0200)]
Fixed off-by-one error in call to XGetKeyboardMapping that meant that max_keycode wasn't retrieved.

Merge-request: 1308
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit f1710803cc17a50d098e945e86ad75d42b036935)

8 years agoClean up properly in the QPF1 font engine
Paul Olav Tvete [Fri, 11 Sep 2009 08:18:12 +0000 (10:18 +0200)]
Clean up properly in the QPF1 font engine

We have to munmap() what we have mmap()ed

Reviewed-by: Gunnar
Reviewed-by: Jeremy
(cherry picked from commit 2ffcf454806d0167c36bb626f07c3cc969206709)

8 years agoChange license files for release.
Jason McDonald [Mon, 14 Sep 2009 03:14:27 +0000 (13:14 +1000)]
Change license files for release.

(cherry picked from commit 3336a02eebfea039fc56355769072aefbca0ba55)



8 years agoUpdate license headers for release.
Jason McDonald [Mon, 14 Sep 2009 02:46:40 +0000 (12:46 +1000)]
Update license headers for release.

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, 14 Sep 2009 02:14:58 +0000 (12:14 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agoFix libiconv support on FreeBSD.
Raphael Kubo da Costa [Sun, 13 Sep 2009 07:40:37 +0000 (09:40 +0200)]
Fix libiconv support on FreeBSD.

For some reason iconv support was broken in Qt 4.5 on FreeBSD, and this
patch was made to fix that.

Original patch by Max Brazhnikov <makc@freebsd.org>.

Original message:
Enable libiconv support.
Didn't get where the real problem is, but using UTF-16LE/BE as default
encoding (see patch) fixes the issue.

Merge-request: 1480
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
8 years agoFix memory leak when deleteLater is triggered via the main menu bar.
Morten Sorvig [Fri, 11 Sep 2009 10:49:25 +0000 (12:49 +0200)]
Fix memory leak when deleteLater is triggered via the main menu bar.

The deleteLater was beeing created with loopLevel of 1, causing
it to be defferd until QApplication::exec() returned.

Add a QScopedLoopLevelCounter to increase the loopLevel while
triggering the action.

RevBy: Brad

8 years agoRemove yet another forgotten debug message.
Morten Sorvig [Thu, 13 Aug 2009 11:08:46 +0000 (13:08 +0200)]
Remove yet another forgotten debug message.

8 years agoPick a suitable default architecture for qmake-based applications.
Morten Sorvig [Thu, 13 Aug 2009 10:37:39 +0000 (12:37 +0200)]
Pick a suitable default architecture for qmake-based applications.

If the Qt package contains one of x86 and x86_64, pick that one. If it
contains both then use the compiler default. Make a similiar decision for
PowerPC-based systems. Note that this logic assumes that Qt has been
configured with an architecture that is usable on the system.

Reviewed-by: Marius Storm-Olsen
8 years agoRun on 10.3.
Morten Sorvig [Fri, 11 Sep 2009 05:51:09 +0000 (07:51 +0200)]
Run on 10.3.

_HIViewScrollRectWithOptions needs to be declared as a weak-linked
symbol in order to make static linking work.

8 years ago Run on 10.3 Panther.
Morten Sorvig [Fri, 11 Sep 2009 05:27:16 +0000 (07:27 +0200)]
 Run on 10.3 Panther.

 HIViewSetNeedsDisplayInRect was added in 10.4.

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

8 years agorestoring a minimized window on Windows CE didn't work
Joerg Bornemann [Thu, 10 Sep 2009 13:55:08 +0000 (15:55 +0200)]
restoring a minimized window on Windows CE didn't work

After restoring a minimized window we only saw the window decoration.
All content was missing. That's because we don't get a WM_SIZE message
for restoring the window. We must react on WM_ACTIVATE in this case.
This fixes the issue for Windows mobile too.

Task-number: 260702
Reviewed-by: thartman
8 years agoQHttpNetworkConnection autotest: include zlib dir
Peter Hartmann [Thu, 10 Sep 2009 13:41:42 +0000 (15:41 +0200)]
QHttpNetworkConnection autotest: include zlib dir

test was not building

Reviewed-by: Trust Me
8 years agoOnly reset the backend pointer after we're done with it
João Abecasis [Thu, 10 Sep 2009 12:40:52 +0000 (14:40 +0200)]
Only reset the backend pointer after we're done with it

Since 925912ebf552417306a5bd20fd986afda6a582be QNetworkReplyImplPrivate
no longer holds its own pointer to the network cache and relies on the
backend to get it. Since the cache is used in our call to finished, we
must reset the backend only after that.

This fixes a crash I was seeing in Arora...

Reviewed-by: Markus Goetz
Reviewed-by: Peter Hartmann
8 years agotst_qinfo: Be more verbose in case of failures
Markus Goetz [Thu, 10 Sep 2009 12:42:58 +0000 (14:42 +0200)]
tst_qinfo: Be more verbose in case of failures

8 years agoMake opengl fragment program generator output license header.
Jason McDonald [Thu, 10 Sep 2009 09:34:39 +0000 (19:34 +1000)]
Make opengl fragment program generator output license header.

Stops the license checker failing each time the file is re-generated.
Also added "_P" to the generated header guard, as it's a private header.

Reviewed-by: Gunnar Sletta
8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Jason McDonald [Thu, 10 Sep 2009 04:45:49 +0000 (14:45 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agoFixes autotest for MS SQL Server
Bill King [Wed, 9 Sep 2009 03:37:09 +0000 (13:37 +1000)]
Fixes autotest for MS SQL Server

Merging fix back into 4.5 tree

8 years agoFixes determination of end of odbc string on deficient driver
Bill King [Tue, 1 Sep 2009 03:08:02 +0000 (13:08 +1000)]
Fixes determination of end of odbc string on deficient driver

Ported this fix backwards from 4.6 to 4.5
Adds some cleanups (using QVarLengthArray), and reverting to the
initial and correct calculation (when the driver doesn't deem fit to
return SQL_NO_DATA).

8 years agoDoc: Note that Netscape plugins are only available on desktop platforms.
David Boddie [Wed, 9 Sep 2009 14:55:13 +0000 (16:55 +0200)]
Doc: Note that Netscape plugins are only available on desktop platforms.

Reviewed-by: Takumi Asaki
Also-applied-as: 3f257dcf8c8ca812d60d4a6a4c2cd2da96bba526

8 years agoAutotest: fix the test for NUL in SAN. It was missing "www".
Thiago Macieira [Wed, 9 Sep 2009 13:51:47 +0000 (15:51 +0200)]
Autotest: fix the test for NUL in SAN. It was missing "www".

Reviewed-by: Marius Bugge Monsen
8 years agotst_qhostinfo: Backported some 4.6 fixes, increased timeout
Markus Goetz [Wed, 9 Sep 2009 12:42:05 +0000 (14:42 +0200)]
tst_qhostinfo: Backported some 4.6 fixes, increased timeout

8 years agoAvoid garbled output on Windows for non-ascii-compatible text
Eskil Abrahamsen Blomfeldt [Wed, 9 Sep 2009 12:27:18 +0000 (14:27 +0200)]
Avoid garbled output on Windows for non-ascii-compatible text

In the Windows print engine, we try to send a text item as a raw string
of characters to the printer driver if this is possible. This is to
facilitate using PDF-printers as much as possible, allowing them to
save the text in the document so for searching etc. We can only safely
do this if all the characters in the string are ASCII-compatible, i.e.
in the 7 bit range, since this is the only part of the set which is
guaranteed to be compatible across code pages.

Task-number: 180655
Reviewed-by: Trond
8 years agoQHttpNetworkConnection autotest: include zlib dir
Peter Hartmann [Wed, 9 Sep 2009 11:58:16 +0000 (13:58 +0200)]
QHttpNetworkConnection autotest: include zlib dir

test was not building

Reviewed-by: Trust Me
8 years agoMake configure show the correct license namefor tech previews.
Jason McDonald [Wed, 9 Sep 2009 05:38:00 +0000 (15:38 +1000)]
Make configure show the correct license namefor tech previews.

Task-number: 261031
Reviewed-by: Trust Me
8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Jason McDonald [Wed, 9 Sep 2009 02:46:43 +0000 (12:46 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agonetwork-settings.h: Check for DNS setup only when needed
Markus Goetz [Tue, 8 Sep 2009 13:52:20 +0000 (15:52 +0200)]
network-settings.h: Check for DNS setup only when needed

8 years agoFix moc test after licence change.
Olivier Goffart [Tue, 8 Sep 2009 13:00:25 +0000 (15:00 +0200)]
Fix moc test after licence change.

os9-newlines.h must not contains any linebreak

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

8 years agoUpdate license headers again.
Jason McDonald [Tue, 8 Sep 2009 11:24:01 +0000 (21:24 +1000)]
Update license headers again.

Reviewed-by: Trust Me
8 years agoFixed bug in drawImage() when fall-back code path is used.
Samuel Rødal [Tue, 18 Aug 2009 15:00:34 +0000 (17:00 +0200)]
Fixed bug in drawImage() when fall-back code path is used.

We need to floor instead of round to prevent rectangles that are on the
edge from being shifted one pixel down / right.

Task-number: 258776
Reviewed-by: Kim
8 years agoUpdate license headers.
Jason McDonald [Tue, 8 Sep 2009 09:36:34 +0000 (19:36 +1000)]
Update license headers.

Reviewed-by: Trust Me
8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Jason McDonald [Tue, 8 Sep 2009 09:06:27 +0000 (19:06 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agoTests: Do not execute network tests at all if DNS setup is broken.
Markus Goetz [Tue, 8 Sep 2009 08:47:44 +0000 (10:47 +0200)]
Tests: Do not execute network tests at all if DNS setup is broken.

Reviewed-by: Jesper
8 years agoDoc: keypad navigation is supported on Windows CE
Joerg Bornemann [Tue, 8 Sep 2009 07:28:41 +0000 (09:28 +0200)]
Doc: keypad navigation is supported on Windows CE

Reviewed-by: thartman
8 years agoFixed compile on Solaris.
Rohan McGovern [Mon, 7 Sep 2009 00:37:42 +0000 (10:37 +1000)]
Fixed compile on Solaris.

The `test' builtin in Solaris' /bin/sh does not understand `-e', use
`-f' instead.

Fixes: configure: test: argument expected

Note, using the `-nokia-developer' configure option hides this

Reviewed-by: Rhys Weatherley
8 years agoRemove license header, which cannot be parsed by Sun assembler.
Rohan McGovern [Sat, 5 Sep 2009 01:17:32 +0000 (11:17 +1000)]
Remove license header, which cannot be parsed by Sun assembler.

Commit 2e0d78836becf24c7f27c982316cf1b4492f27aa fixed this for i386
but omitted the fix for x86_64.

8 years agoFix pixel snow on the combo box popup on Snow Leopard.
Morten Sorvig [Fri, 4 Sep 2009 12:22:17 +0000 (14:22 +0200)]
Fix pixel snow on the combo box popup on Snow Leopard.

On 10.5 and below the pixmap data bytes happened to be initialized by
malloc, on 10.6 this is no longer the case.

Revby: Gunnar Sletta <gunnar@trolltech.com>

Similar to 28f94e1ef94f.

8 years agoWizard background images incorrect in Snow Leopard.
Prasanth Ullattil [Mon, 3 Aug 2009 13:46:04 +0000 (15:46 +0200)]
Wizard background images incorrect in Snow Leopard.

We need to clear the QPixmap before the image is drawn using the

Reviewed-by: Norwegian Rock Cat
8 years agoFix a regression with QListView::setRowHidden() when a root index is set
Andy Shaw [Fri, 4 Sep 2009 09:06:08 +0000 (11:06 +0200)]
Fix a regression with QListView::setRowHidden() when a root index is set

When setRowHidden() was called after a root index was set then it would
not actually hide the row, if a root index is not set then it worked

Task-number: 260879
Reviewed-by: Jan-Arve
8 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Jason McDonald [Fri, 4 Sep 2009 08:29:55 +0000 (18:29 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

8 years agoFixed clipping of native style elements when raster is used on mac
Gunnar Sletta [Fri, 4 Sep 2009 06:30:02 +0000 (08:30 +0200)]
Fixed clipping of native style elements when raster is used on mac

Reviewed-by: Trond
8 years agoAdd license headers to .l files.
Jason McDonald [Fri, 4 Sep 2009 06:38:54 +0000 (16:38 +1000)]
Add license headers to .l files.

Reviewed-by: Trust Me
8 years agoAdd license headers to python code
Jason McDonald [Fri, 4 Sep 2009 05:58:13 +0000 (15:58 +1000)]
Add license headers to python code

Reviewed-by: Trust Me