9 years agoFixed the invalid license header.
Trond Kjernåsen [Thu, 17 Sep 2009 15:12:34 +0000 (17:12 +0200)]
Fixed the invalid license header.

This caused the tests/header test to fail.

Reviewed-by: Kim
9 years agoClean up my previous commit (remove comment and whitespace fix)
Jan-Arve Sæther [Thu, 17 Sep 2009 13:47:21 +0000 (15:47 +0200)]
Clean up my previous commit (remove comment and whitespace fix)

9 years agoFix the scrollTo() test function on Windows.
Jan-Arve Sæther [Thu, 17 Sep 2009 13:29:23 +0000 (15:29 +0200)]
Fix the scrollTo() test function on Windows.

After the QTRY_COMPARE was added, the size of the view suddenly
became a hard requirement. However, this reqirement was not met on
windows, since the forcedSize was smaller than the minimum size allowed
for the view.

Thus, it would never have its size set to forcedSize and the
QTRY_COMPARE would fail.

9 years agoFixed a bug in QToolTip when internal tool tips where reused.
Trond Kjernaasen [Thu, 17 Sep 2009 13:07:03 +0000 (15:07 +0200)]
Fixed a bug in QToolTip when internal tool tips where reused.

If a tool tip is to be reused, it *has* to be visible otherwise
it *may* get destroyed by the expiration timer before the timer is reset.
The tst_qtooltip::setPalette() test triggered this obscure bug under

Reviewed-by: Kim
9 years agoImplement hasConflicts().
Jan-Arve Sæther [Wed, 9 Sep 2009 11:23:31 +0000 (13:23 +0200)]
Implement hasConflicts().

9 years agoFix regression after code review
Shane Kearns [Thu, 17 Sep 2009 12:28:16 +0000 (14:28 +0200)]
Fix regression after code review

The branch maintained its own set of native windows.
This was commented to be a duplication of the native window list kept
by QWidgetPrivate, and changed.
Unfortunately, the set maintained on the branch contained only window
owning controls, while the list kept by QWidgetPrivate contains all
widgets that have a CCoeControl.
Added a check for whether the control is window owning before using its
DrawableWindow() to avoid getting a null pointer.

Reviewed-by: Jason Barron
9 years agoUpdate def files
Shane Kearns [Thu, 17 Sep 2009 08:09:27 +0000 (10:09 +0200)]
Update def files

DEF files for ARMv5 UREL, that include the autotest exports.
Note that Q_AUTOTEST_EXPORT is only on by default in internal builds

Reviewed-by: Iain
9 years agoFix unused variable compiler warning
Shane Kearns [Thu, 17 Sep 2009 07:48:07 +0000 (09:48 +0200)]
Fix unused variable compiler warning

Removed UID that wasn't used.

Reviewed-by: Jason Barron
9 years agoEnable compiling Symbian port with QT_NO_CURSOR
Shane Kearns [Thu, 17 Sep 2009 07:45:52 +0000 (09:45 +0200)]
Enable compiling Symbian port with QT_NO_CURSOR

Added some missing #ifdef QT_NO_CURSOR, so the symbian port still
compiles if this feature is configured out.

Reviewed-by: Jason Barron
9 years agoFix glyph selection in symbol fonts that contain unicode cmap table
Eskil Abrahamsen Blomfeldt [Thu, 17 Sep 2009 11:21:14 +0000 (13:21 +0200)]
Fix glyph selection in symbol fonts that contain unicode cmap table

Some symbol fonts will contain a unicode cmap table in addition to the
microsoft symbol cmap table that maps the symbol range (private range
0xf000 - 0xf100) into the correct glyphs. This is essentially a broken
unicode table, and we should not prefer it if these conditions are true.
In the strict cases where these conditions apply, we fall back to the
symbol table instead.

Task-number: QT-2354
Done-with: Lars
Reviewed by: Lars

9 years agoWrong string when setting formula through menu in demos/spreadsheet.
Gabriel de Dietrich [Thu, 17 Sep 2009 12:12:12 +0000 (14:12 +0200)]
Wrong string when setting formula through menu in demos/spreadsheet.

Reviewed-by: TrustMe
Task-number: 260975
Task-number: QT-4506

9 years agoMerge branch 'orbit-fixes' into 4.6
Jan-Arve Sæther [Thu, 17 Sep 2009 12:10:29 +0000 (14:10 +0200)]
Merge branch 'orbit-fixes' into 4.6

9 years agoAdd QEXPECT_FAIL for the one test that fails.
Jan-Arve Sæther [Thu, 17 Sep 2009 11:40:15 +0000 (13:40 +0200)]
Add QEXPECT_FAIL for the one test that fails.

Note that t does not fail with simplification turned off

9 years agoAdd QTest::ignoreMessage() calls in order to reduce some console noise.
Jan-Arve Sæther [Thu, 17 Sep 2009 10:58:16 +0000 (12:58 +0200)]
Add QTest::ignoreMessage() calls in order to reduce some console noise.

9 years agoQGraphicsAnchorLayout: Added new autotests file
Jesus Sanchez-Palencia [Wed, 16 Sep 2009 17:37:50 +0000 (14:37 -0300)]
QGraphicsAnchorLayout: Added new autotests file

Several autotests written by the Orbit team were added as a new
QGraphicsAnchorLayout autotests file.

Signed-off-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
9 years agoQGraphicsAnchorLayout: Remove QGALPrivate::deleteAnchorData()
Eduardo M. Fleury [Tue, 15 Sep 2009 23:01:45 +0000 (20:01 -0300)]
QGraphicsAnchorLayout: Remove QGALPrivate::deleteAnchorData()

This method, formerly called by the QGraphicsAnchor destructor, to
remove the anchor associated to it, is no longer needed.

That destructor now calls QGALPrivate::removeAnchor(), a method
analagous to addAnchor(), that provides the high level feature
of "anchor removal".

Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
9 years agoQGraphicsAnchorLayoutPrivate: Removing item from layout when there are no more anchors
Jesus Sanchez-Palencia [Tue, 15 Sep 2009 20:10:32 +0000 (17:10 -0300)]
QGraphicsAnchorLayoutPrivate: Removing item from layout when there are no more anchors

Now the removeAnchor() method has returned and it is ready for being use in the API for ensure
that items are removed from the layout when they have no more external anchors.

Signed-off-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
9 years agoQGraphicsAnchorLayoutPrivate: Removing method removeAnchor()
Jesus Sanchez-Palencia [Tue, 15 Sep 2009 19:59:20 +0000 (16:59 -0300)]
QGraphicsAnchorLayoutPrivate: Removing method removeAnchor()

All method calls were replaced by calling removeAnchor_helper(), with
internalVertex() calls

Signed-off-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
9 years agoQGraphicsAnchorLayout: Removing methods names inconsistencies on private class
Jesus Sanchez-Palencia [Tue, 15 Sep 2009 19:28:56 +0000 (16:28 -0300)]
QGraphicsAnchorLayout: Removing methods names inconsistencies on private class

QGraphicsAnchorLayoutPrivate now has addAnchor() replacing anchor() and
addAnchor_helper() replacing addAnchor(). With this changes we are respecting
the API behavior, where anchor() is a "getter" instead of a "setter".

Signed-off-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
9 years agoQGraphicsAnchorLayout: Handle negative spacing in "setAnchorSpacing"
Eduardo M. Fleury [Fri, 11 Sep 2009 21:21:08 +0000 (18:21 -0300)]
QGraphicsAnchorLayout: Handle negative spacing in "setAnchorSpacing"

The simplex solver cannot handle negative-sized anchors. Those
should be handled by the layout itself. This is done by inverting
such anchors and making their size positive again.

Ie. A --> B  with size -10   becomes   B --> A with size 10

Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
9 years agoQGraphicsAnchorLayout: Fix anchor creation heuristics
Eduardo M. Fleury [Fri, 11 Sep 2009 20:59:46 +0000 (17:59 -0300)]
QGraphicsAnchorLayout: Fix anchor creation heuristics

Fixing the case where creating an anchor between the
layout Left edge and an item Right edge (or vice-versa)
would have different behaviors depending on the argument

Now both calls below have the same meaning:
  addAnchor(layout, Qt::AnchorLeft, widget, Qt::AnchorRight)
  addAnchor(widget, Qt::AnchorRight, layout, Qt::AnchorLeft)

Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
9 years agoControl-drag header selection behaved wierdly.
Gabriel de Dietrich [Thu, 17 Sep 2009 11:07:30 +0000 (13:07 +0200)]
Control-drag header selection behaved wierdly.

The QItemSelectionModel::Current was not set in
QTableViewPrivate::selectColumn(). However, Control-drag selection in
QTableView behaved differently than other software such as OpenOffice's

Now the behaviour when Control-dragging is that the selection will be set to
the opposite of the selection state of the first cell. If that cell is
selected, we will deselected the cells while dragging, and conversely, if it
isn't selected, the cells will be selected.

Reviewed-by: Olivier
Task-number: QT-1435
Task-number: 191545

9 years agoMerge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt-releases; branch '4.6' of...
Jason McDonald [Thu, 17 Sep 2009 11:00:18 +0000 (21:00 +1000)]
Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt-releases; branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

9 years agoFix license headers.
Jason McDonald [Thu, 17 Sep 2009 10:56:40 +0000 (20:56 +1000)]
Fix license headers.

Reviewed-by: Trust Me
9 years agoFixed QFileInfo autotest absolute path tests not to expect C-drive.
Miikka Heikkinen [Thu, 17 Sep 2009 10:53:35 +0000 (13:53 +0300)]
Fixed QFileInfo autotest absolute path tests not to expect C-drive.

Changed absolute path tests so that they will work from any drive.

Reviewed-by: Shane Kearns
9 years agoStabilize tst_QGraphicsItem::hoverEventsGenerateRepaints.
Bjørn Erik Nilsen [Thu, 17 Sep 2009 10:46:18 +0000 (12:46 +0200)]
Stabilize tst_QGraphicsItem::hoverEventsGenerateRepaints.

Make the test independent of window activation; we're only
interested in the behavior for hover events.

9 years agoStabilize tst_QGraphicsItem::cacheMode on the Mac.
Bjørn Erik Nilsen [Thu, 17 Sep 2009 10:31:39 +0000 (12:31 +0200)]
Stabilize tst_QGraphicsItem::cacheMode on the Mac.

Problem was that the window got activated *after* the items
were added to the scene, causing two repaints on the viewport.

9 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Sarah Smith [Thu, 17 Sep 2009 08:48:44 +0000 (18:48 +1000)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

9 years agoFix qdoc warning about missing file
Sarah Smith [Thu, 17 Sep 2009 08:42:51 +0000 (18:42 +1000)]
Fix qdoc warning about missing file

Reviewed-by: TrustMe
9 years agoAdd a new wildcard mode similar to bash in QRegExp
Benjamin Poulain [Wed, 16 Sep 2009 18:46:10 +0000 (20:46 +0200)]
Add a new wildcard mode similar to bash in QRegExp

It is not possible to escape a wildcard character in the Wildcard
mode of QRegExp. This follows the kind of wildcard of the CLI of Windows

The new WildCardUnix follows the escaping of a unix's bash.

Task-number: 241346
Reviewed-by: Olivier Goffart
Reviewed-by: Matthew Cattell
9 years agoMerge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6
Simon Hausmann [Thu, 17 Sep 2009 07:05:18 +0000 (09:05 +0200)]
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6


9 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Morten Sorvig [Thu, 17 Sep 2009 04:52:40 +0000 (06:52 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6

9 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Sarah Smith [Thu, 17 Sep 2009 03:17:46 +0000 (13:17 +1000)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

9 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
9 years agoqdoc: QGLContext::drawTexture referring to itself.
Rhys Weatherley [Thu, 17 Sep 2009 02:10:23 +0000 (12:10 +1000)]
qdoc: QGLContext::drawTexture referring to itself.

9 years agoRevert "Added support for subpixel antialiasing on text in the GL2 engine."
Rhys Weatherley [Thu, 17 Sep 2009 01:22:05 +0000 (11:22 +1000)]
Revert "Added support for subpixel antialiasing on text in the GL2 engine."

Breaks the GL2 paint engine on X11 and OpenGL/ES 2.0.

This reverts commit b8ff02a67ebd8246253823b53cfed98eef400547.

9 years agoSimplify QDirectFBPixmapData::fromDataBuffer
Anders Bakken [Wed, 16 Sep 2009 22:02:47 +0000 (15:02 -0700)]
Simplify QDirectFBPixmapData::fromDataBuffer

There's no need for the intermediate surface creation. RenderTo will
handle things like palette/transparency etc. Should also provide some

Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
9 years agoMake QT_DIRECTFB_PALETTE an opt-in option
Anders Bakken [Wed, 16 Sep 2009 21:25:53 +0000 (14:25 -0700)]
Make QT_DIRECTFB_PALETTE an opt-in option

This seems not work correctly on quite a few boards so I'd rather have
people turn it on explicitly.

Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
9 years agohave make_qfeatures_dot_h use QTSRCDIR if defined, update qfeatures.h
Jeremy Katz [Wed, 16 Sep 2009 15:14:22 +0000 (17:14 +0200)]
have make_qfeatures_dot_h use QTSRCDIR if defined, update qfeatures.h

Reviewed-by: Paul
9 years agoQGlobal: fix Windows error reporting
Peter Hartmann [Wed, 16 Sep 2009 13:03:44 +0000 (15:03 +0200)]
QGlobal: fix Windows error reporting

before, we did not retrieve the detailed error message correctly on

Reviewed-by: Joao
9 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
9 years agoMake EGL a requirement for building OpenGL on QWS
Tom Cooksey [Wed, 16 Sep 2009 13:55:01 +0000 (15:55 +0200)]
Make EGL a requirement for building OpenGL on QWS

Currently, QtOpenGL on QWS needs to link against an EGL library. While
we'd one day like to change that, it will be that way in Qt 4.6.

Reviewed-By: Paul
9 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Shane Kearns [Wed, 16 Sep 2009 13:53:21 +0000 (15:53 +0200)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

9 years agoFixed linking on Windows.
Trond Kjernaasen [Wed, 16 Sep 2009 13:53:05 +0000 (15:53 +0200)]
Fixed linking on Windows.

Reviewed-by: Kim
9 years agoDoc: Made the QDockWidget::windowTitle property non-internal.
David Boddie [Wed, 16 Sep 2009 13:53:44 +0000 (15:53 +0200)]
Doc: Made the QDockWidget::windowTitle property non-internal.

Reviewed-by: Trust Me
9 years agoDoc: Added notes about using dock widgets and fixed some references.
David Boddie [Wed, 16 Sep 2009 12:41:59 +0000 (14:41 +0200)]
Doc: Added notes about using dock widgets and fixed some references.

Reviewed-by: Trust Me
9 years agoFix QTimer overflow with interval > 35 minutes on symbian
Shane Kearns [Wed, 16 Sep 2009 13:48:59 +0000 (15:48 +0200)]
Fix QTimer overflow with interval > 35 minutes on symbian

For long intervals, restart the system timer every 2000 seconds
New autotest to verify long timers don't crash or complete immediately

Task-number: QT-651
Reviewed-by: axis
9 years agoStabilize tests
Olivier Goffart [Wed, 16 Sep 2009 13:34:01 +0000 (15:34 +0200)]
Stabilize tests

9 years agoDon't crash on exit if the X11 clipboard owner has not been created.
Bradley T. Hughes [Wed, 16 Sep 2009 13:32:17 +0000 (15:32 +0200)]
Don't crash on exit if the X11 clipboard owner has not been created.

Owner can be null, don't try to deref it if it is.

9 years agoRemove unnecessary lines from MMP files when using libstdcppv5.dll
Iain [Wed, 16 Sep 2009 10:33:10 +0000 (11:33 +0100)]
Remove unnecessary lines from MMP files when using libstdcppv5.dll

SBSv1 has also been updated to define the appropriate macros and add the
required library statements, so all that is needed is the STDCPP keyword

Reviewed-by: mread
9 years agoFix alpha setting in Designer's "Edit Palette" window
Friedemann Kleint [Wed, 16 Sep 2009 13:18:04 +0000 (15:18 +0200)]
Fix alpha setting in Designer's "Edit Palette" window

Use QColorDialog::getColor() instead of deprecated
QColorDialog::getRgba(), which causes alpha value
to get lost in the process.

Task-number: QT-4494
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
9 years agoPut back the declarativeData into its union so it doesn't take memory
Olivier Goffart [Wed, 16 Sep 2009 10:21:38 +0000 (12:21 +0200)]
Put back the declarativeData into its union so it doesn't take memory

As it was in commit 025dcc2bb

Reviewed-by: Thiago
9 years agoMove QGuard to the ExtraData
Olivier Goffart [Wed, 16 Sep 2009 10:14:40 +0000 (12:14 +0200)]
Move QGuard to the ExtraData

not every QObject need a pointer to the QGuard while none of them will
usually use it (it is private API)

Reviewed-by: Thiago
9 years agoFix tst_QGL::openGLVersionCheck() autotest on OpenGL ES platforms
Tom Cooksey [Wed, 16 Sep 2009 12:14:45 +0000 (14:14 +0200)]
Fix tst_QGL::openGLVersionCheck() autotest on OpenGL ES platforms

Reviewed-by: Trustme
9 years agoMake QtOpenGL on X11/EGL less chatty with it's debug output
Tom Cooksey [Wed, 16 Sep 2009 12:16:59 +0000 (14:16 +0200)]
Make QtOpenGL on X11/EGL less chatty with it's debug output

Reviewed-by: Trustme
9 years agoMake test pass after license header changes
Paul Olav Tvete [Wed, 16 Sep 2009 12:51:18 +0000 (14:51 +0200)]
Make test pass after license header changes

Reviewed-by: TrustMe
9 years agoUpdating line numbers in uic3 auto-tests
João Abecasis [Wed, 16 Sep 2009 12:30:16 +0000 (14:30 +0200)]
Updating line numbers in uic3 auto-tests

9 years agoDocument that errors from flush are ignored in QFile::close()
João Abecasis [Tue, 15 Sep 2009 16:29:28 +0000 (18:29 +0200)]
Document that errors from flush are ignored in QFile::close()

Reviewed-by: Andy Shaw
9 years agoFix to QSyntaxHighlighter not rehighlighting enough
mae [Wed, 16 Sep 2009 12:15:27 +0000 (14:15 +0200)]
Fix to QSyntaxHighlighter not rehighlighting enough

When entire blocks get deleted, the last block for rehighlighting
would be the block _before_ the deleted blocks. This is wrong,
since the deleted blocks could have contained characters which
affect the state. The patch lets the highlighter check for one
more character.

Reviewed-by: thorbjorn
9 years agoQFontMetrics::boundingRect(QString) returns incorrect width on Mac OS X
Prasanth Ullattil [Wed, 16 Sep 2009 11:21:48 +0000 (13:21 +0200)]
QFontMetrics::boundingRect(QString) returns incorrect width on Mac OS X

This bug appears only in Carbon port (ATSUI font engine). While finding
the character stops, this font engine relys on the RTL flags. As an
optimization, for this particular version of boundingRect(), BIDI is
ignored. So for this font engine, we will always use the correct RTL

Task-number: 213109
Done-with: Eskil
Reviewed-by: Simon Hausmann
9 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
9 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.

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

Reviewed-by: Kim
9 years agodoc: Fixed some qdoc errors.
Martin Smith [Wed, 16 Sep 2009 10:41:15 +0000 (12:41 +0200)]
doc: Fixed some qdoc errors.

9 years agoSmall optimisation in QFontMetrics multi-length-string 4.6-stable
Olivier Goffart [Tue, 15 Sep 2009 08:04:16 +0000 (10:04 +0200)]
Small optimisation in QFontMetrics multi-length-string

Change the len instead of copying the string.
Idea from Warwick

Reviewed-by: Warwick Allison
9 years agoImplemented the SAVE_TARGET in QClipboard on X11
Denis Dzyubenko [Tue, 15 Sep 2009 17:46:01 +0000 (19:46 +0200)]
Implemented the SAVE_TARGET in QClipboard on X11

Added support for the simpliest SAVE_TARGET mechanizm allowing us to
work nicely with clipboard managers, so that when Qt application that
owns the clipboard exits we delegate the content to the clipboard
manager if there is one.

The current implementation doesn't specify which targets to give to
the manager, so it will try to fetch as much as possible.  Also, right
now we do not support the TARGET_SIZES target, meaning that the
manager doesn't know how much data it is going to fetch, so it will
try to fetch everything even if it can take a lot of time.

Reviewed-by: Bradley T. Hughes
9 years agoAdded support for subpixel antialiasing on text in the GL2 engine.
Kim Motoyoshi Kalland [Tue, 8 Sep 2009 12:30:19 +0000 (14:30 +0200)]
Added support for subpixel antialiasing on text in the GL2 engine.

The antialiasing is currently not gamma corrected.

Reviewed-by: Samuel
9 years agoSeparate the copy of JavaScriptCore that QtScript uses from the copy that
Simon Hausmann [Wed, 16 Sep 2009 07:51:00 +0000 (09:51 +0200)]
Separate the copy of JavaScriptCore that QtScript uses from the copy that
QtWebKit uses.

This is needed to decouple QtScript from QtWebKit, as discussed in the
WebKit team.

Reviewed-by: Kent Hansen
9 years agoqdoc: Added the "All Functions" link back into the header.
Martin Smith [Wed, 16 Sep 2009 07:55:52 +0000 (09:55 +0200)]
qdoc: Added the "All Functions" link back into the header.

9 years agoHide getStaticMetaObject() on platforms without Q_NO_DATA_RELOCATION
Shane Kearns [Wed, 16 Sep 2009 07:10:34 +0000 (09:10 +0200)]
Hide getStaticMetaObject() on platforms without Q_NO_DATA_RELOCATION

getStaticMetaObject() is a workaround for linkage problems on symbian
platform, so it does not exist on other platforms.
This change makes the forward declaration inside Q_OBJECT only present
when Q_NO_DATA_RELOCATION is defined

Reviewed-by: axis
9 years agodoc: Fixed some qdoc errors.
Martin Smith [Wed, 16 Sep 2009 06:54:20 +0000 (08:54 +0200)]
doc: Fixed some qdoc errors.

9 years agoFixes: Fixed incorrect tracks number calculation with phonon/gst
Dmytro Poplavskiy [Wed, 16 Sep 2009 06:55:29 +0000 (16:55 +1000)]
Fixes:      Fixed incorrect tracks number calculation with phonon/gst
RevBy:      Andrew den Exter

gst_element_query_duration(element,format,duration) doesn't always
return duration in format being asked for (tracks in this case),
it can also return duration in format it can (Time) and modify
format parameter, so check the format is still the same
as requested is necessary. This bug prevented Phonon to emit finished()
signal with some files, since it expected next tracks to exist.

9 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Gunnar Sletta [Wed, 16 Sep 2009 06:52:46 +0000 (08:52 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6

9 years agoFixed glsl warnings on mac and stop using texturecoords when not needed
Gunnar Sletta [Wed, 16 Sep 2009 06:18:10 +0000 (08:18 +0200)]
Fixed glsl warnings on mac and stop using texturecoords when not needed

The setTextureCoordsEnabled was enabled in two places, but never disabled
causing it to always be used. When using a varying in a vertex shader
and not using it again in the fragment shader this produces a warning,
and rightly so. Since the property is 100% detectable based on the
fragment shader used, move the logic into the shader selection code
and kill the property all together. This should also speed up
solid filling a bit...

9 years agoImprove font handling on Mac/Cocoa.
Morten Sorvig [Wed, 16 Sep 2009 05:53:15 +0000 (07:53 +0200)]
Improve font handling on Mac/Cocoa.

The Mac/Cocoa font database currently relies on two APIs, ATSUI (old)
and CoreText (new). These are interchangable and work on the same font

Some differences do exist, in particular ATSFontFamilyGetName seems
to return the same as ATSFontGetName for some fonts - the font name,
not the family name. In any case, the old ATS code path is initializing
QFontDatabase::familes() with the font name.

This causes a naming mismatch with code that uses CoreText and gets
the proper family name, in this case in initializeDb(). The fix is
to make sure the correct family name is used by using the CoreText
API to access it.

RevBy: TrustMe

9 years agoReduce overhead of paint engine-specific pixmap filters
Rhys Weatherley [Wed, 16 Sep 2009 01:46:41 +0000 (11:46 +1000)]
Reduce overhead of paint engine-specific pixmap filters

Engine-specific pixmap filters were being created, used, and destroyed
every time draw() was called on QPixmapColorizeFilter, QPixmapBlurFilter,
and so on.  This had a heavy performance penalty and made it difficult
for the GL paint engine to cache shaders from one request to the next.

A generic filter can request an engine-specific filter that matches its
parameters.  The engine can either create a new one or return a previously
allocated filter object.

Ownership of engine-specific pixmap filter objects is moved to the
paint engine itself.

Reviewed-by: Andrew den Exter
Reviewed-by: Michael Brasser
Reviewed-by: Michael Goddard
Reviewed-by: Sarah Smith
9 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Sarah Smith [Wed, 16 Sep 2009 01:40:18 +0000 (11:40 +1000)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

9 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Rhys Weatherley [Wed, 16 Sep 2009 01:13:21 +0000 (11:13 +1000)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

9 years agoFix crash in QVGSharedContext shutdown
Rhys Weatherley [Wed, 16 Sep 2009 01:11:41 +0000 (11:11 +1000)]
Fix crash in QVGSharedContext shutdown

The reference count was reducing down to zero during paint engine
cleanup when we weren't ready to destroy the context.  Artificially
increase it to prevent the early context destroy.

Reviewed-by: Sarah Smith
9 years agoFix QLineEdit drag'n'drop
Alan Alpert [Tue, 15 Sep 2009 23:52:04 +0000 (09:52 +1000)]
Fix QLineEdit drag'n'drop

QLineEdit shouldn't have been moving the text cursor while dragging.

Task-number: 260457
Reviewed-by: mbm
9 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Alan Alpert [Tue, 15 Sep 2009 23:45:32 +0000 (09:45 +1000)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

9 years agoFix QLineEdit::setPalette
Alan Alpert [Tue, 15 Sep 2009 23:43:45 +0000 (09:43 +1000)]
Fix QLineEdit::setPalette

QLineControl has a separate palette that wasn't getting updated.

Task-number: 261239
Reviewed-by: mbm
9 years agoOnly regenerate pixmap filter source if the parameters have changed.
Rhys Weatherley [Tue, 15 Sep 2009 23:31:01 +0000 (09:31 +1000)]
Only regenerate pixmap filter source if the parameters have changed.

Reviewed-by: trustme
9 years agoRemove unnecessary definitions in GL pixmap filter code.
Rhys Weatherley [Tue, 15 Sep 2009 22:55:41 +0000 (08:55 +1000)]
Remove unnecessary definitions in GL pixmap filter code.

The code does not use QGLShader directly any more.

Reviewed-by: trustme
9 years agoFix glMatrixMode() arguments for desktop OpenGL
Rhys Weatherley [Tue, 15 Sep 2009 22:40:46 +0000 (08:40 +1000)]
Fix glMatrixMode() arguments for desktop OpenGL

The _MATRIX defines are for fetching the matrix, not setting it.

Reviewed-by: trustme
9 years agoCompilation fix for OpenGL/ES 2.0
Rhys Weatherley [Tue, 15 Sep 2009 22:31:47 +0000 (08:31 +1000)]
Compilation fix for OpenGL/ES 2.0

Matrix functions do not exist under OpenGL/ES 2.0.

Reviewed-by: trustme
9 years agoExport a function for getting a IDirectFBWindow
Anders Bakken [Tue, 15 Sep 2009 18:28:07 +0000 (11:28 -0700)]
Export a function for getting a IDirectFBWindow

This function is only exported when DirectFB is built into QtGui.

Reviewed-by: Donald Carr <donald.carr@nokia.com>
9 years agoExport two functions for getting a surface in dfb
Anders Bakken [Mon, 14 Sep 2009 18:02:11 +0000 (11:02 -0700)]
Export two functions for getting a surface in dfb

When building DirectFB as part of QtGui and not as a plugin this patch
will export two global functions for getting a surface given a widget.

Reviewed-by: Donald Carr <donald.carr@nokia.com>
9 years agoFix a bug in surfaceForWidget
Anders Bakken [Mon, 14 Sep 2009 18:23:09 +0000 (11:23 -0700)]
Fix a bug in surfaceForWidget

I had the logic of the assert wrong with the isAncestorOf call.

Reviewed-by: Donald Carr <donald.carr@nokia.com>
9 years agoStabilize tst_QComboBox::task260974_menuItemRectangleForComboBoxPopup
Olivier Goffart [Tue, 15 Sep 2009 15:48:12 +0000 (17:48 +0200)]
Stabilize tst_QComboBox::task260974_menuItemRectangleForComboBoxPopup

9 years agoSlightly better code for the test.
Alexis Menard [Tue, 15 Sep 2009 16:41:51 +0000 (18:41 +0200)]
Slightly better code for the test.

Then the test doesn't leak.


9 years agoFix macplist autotest
João Abecasis [Tue, 15 Sep 2009 16:04:55 +0000 (18:04 +0200)]
Fix macplist autotest

This goes to show that once a test is running no one will look at the

9 years agoDoc: Added missing files for the Designer manual.
David Boddie [Tue, 15 Sep 2009 15:49:37 +0000 (17:49 +0200)]
Doc: Added missing files for the Designer manual.

Reviewed-by: Trust Me
Overcomplicated-workflow-by: Git
9 years agoAdded autotest to demonstrate clipping path problem
andyc [Fri, 3 Jul 2009 21:25:25 +0000 (17:25 -0400)]
Added autotest to demonstrate clipping path problem

9 years agoDoc: Created a new Drawing Utility Functions page.
David Boddie [Tue, 15 Sep 2009 15:21:24 +0000 (17:21 +0200)]
Doc: Created a new Drawing Utility Functions page.

Reviewed-by: Trust Me
Inspired-by: Olivier Goffart's earlier change
Pain-by: Git
9 years agoDoc: Cleaned up the Designer main window and Embedded Linux pages.
David Boddie [Tue, 15 Sep 2009 15:17:07 +0000 (17:17 +0200)]
Doc: Cleaned up the Designer main window and Embedded Linux pages.

Reviewed-by: Trust Me
9 years agoIncreasing a timeout on QProcess tests
João Abecasis [Tue, 15 Sep 2009 15:01:18 +0000 (17:01 +0200)]
Increasing a timeout on QProcess tests

Not a proper fix, but let's see if this increases reliability of the

9 years agoI don't think this was intentional...
João Abecasis [Thu, 10 Sep 2009 16:31:39 +0000 (18:31 +0200)]
I don't think this was intentional...

Wonder how it survived for so long.

Reviewed-by: Peter Hartmann
9 years agoIncreased performance of blurpicker example with GL 2 engine.
Samuel Rødal [Tue, 15 Sep 2009 13:11:01 +0000 (15:11 +0200)]
Increased performance of blurpicker example with GL 2 engine.

Slightly increase threshold for when to shrink an FBO, and reduce the
number of calls to glBindFramebuffer.

Reviewed-by: Tom
9 years agoFix QGraphicsView::scrollAfterResize autotest on Mac.
Alexis Menard [Tue, 15 Sep 2009 11:29:04 +0000 (13:29 +0200)]
Fix QGraphicsView::scrollAfterResize autotest on Mac.

The auto-test was failing because it calculate the scrollbar indent
using style primitives. It's very fragile and doesn't work on MacOS
style (and may not work on other style too). Since we don't test style
stuff here, we can just apply the plastique style for this test.