9 years agoRevert "Added autotest to demonstrate clipping path problem"
Alexis Menard [Thu, 17 Sep 2009 09:30:36 +0000 (11:30 +0200)]
Revert "Added autotest to demonstrate clipping path problem"

This reverts commit e7042dea2431b8f64574d4e97eb896285b328c8b.

Alexis : This should never have been here. E-mail is invalid.

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 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
9 years agoSkip the multipleFBOInterleavedRendering autotest on when using OpenGL 1
Tom Cooksey [Thu, 17 Sep 2009 08:24:34 +0000 (10:24 +0200)]
Skip the multipleFBOInterleavedRendering autotest on when using OpenGL 1

Interleaved rendering to GL targets is going to be flaky with the GL1
engine and wont be supported.

Reviewed-by: Trustme
9 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.

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 agocontext()->makeCurrent() is called above, so this is redundant.
Gunnar Sletta [Wed, 16 Sep 2009 08:39:56 +0000 (10:39 +0200)]
context()->makeCurrent() is called above, so this is redundant.

Reviewed-by: Samuel
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.


9 years agoChange compile options for configure so it can be built using msvc2008
Shane Kearns [Tue, 15 Sep 2009 12:53:43 +0000 (14:53 +0200)]
Change compile options for configure so it can be built using msvc2008

Use the -MT command line option so it links statically with libc.
The reason for this is that not all windows versions have the DLL
"out of the box".

Reviewed-by: Marius Storm-Olsen
9 years agoQCursor support for Symbian OS
Shane Kearns [Tue, 15 Sep 2009 12:12:08 +0000 (14:12 +0200)]
QCursor support for Symbian OS

Reviewed-By: Jason Barron
Reviewed-By: Alessandro Portale
    QT_NO_CURSOR is now not defined for symbian builds
    Existing QCursor APIs are all supported
    New public API, QApplication::setNavigationMode, to allow the navigation
    mode to be set. I.E. on an S60 3.2 phone, some applications will want a
    virtual mouse cursor (web browser), while others are designed for keypad
    Symbian HAL is used for detecting input capabilities.

    Fix DND, code cleanup & comment

    QCursor visibility now uses a refcount, and is called from DND and the
    setNavigationMode so they are both simpler and don't interfere with each


    New public API for configuring cursor/keypad navi style.
    This links in with ongoing work on the 4-way keypad navi branch, but
    2-way and 4-way modes both act as 2-way mode until that is integrated
    Some of the demos/examples have cursor switched on (those that were not
    usable with keypad)

    Virtual mouse support for non touch, non mouse phones (tested on N78)

    add *.d and .metadata (carbide debug file / workspace dir) to .gitignore

    System pointers are unavailable when using sprite workaround, so the
    system cursor shapes are compiled into qtgui as resources.
    MAC port does this also for shapes that aren't standard on the MAC.

    Refactor Drag'n'Drop to use QCursor

    Add test case to check all system cursor shapes

    Simply a mainwindow containing a label widget for each cursor shape,
    with the cursor property set appropriately

    QCursor(QBitmap,QBitmap) supported

    Fixed problem with the image & mask being inverted when using the
    QCursor constructor that takes two mono bitmaps.

    add .make.cache files to .gitignore

    Correct implementation of QApplication::setOverrideCursor

    QApplication::restoreOverrideCursor and QApplication::setOverrideCursor
    are now working correctly on Symbian platform.
    Performance will be slower compared with other platforms, because the
    Symbian window server has a cursor associated with each native window.

    Add test case for custom cursors

    Create a pixmap cursor and associate it with a widget.
    No changes to production code, since test passed 1st time ;)

    Add manual test for QCursor

    Make cursor independent of construction order

    Updated to work around window server issue where contruction order
    affects what cursor is displayed in child windows.
    Also changed to effectiveWinId following review comments
    Also fixed a problem which would make qcursor not link if configured
    with QT_NO_CURSOR

    Moved some multiply declared extern functions from cpp to _p.h files
    Implemented Symbian versions of the cursor functions.

    Merged in work I'd done based on tower.
    Fill in bits of stub functions based on windows port

    Removed QT_NO_CURSOR from list of config options forced on symbian
    Recompiled configure.exe
    Added stub functions for the missing functions in s60 port

9 years agoSilenced GLSL compiler warning on Mac OS X
Gunnar Sletta [Tue, 15 Sep 2009 12:17:22 +0000 (14:17 +0200)]
Silenced GLSL compiler warning on Mac OS X

9 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
9 years agoMake the scrollUpdate test function work.
Jan-Arve Sæther [Tue, 15 Sep 2009 13:23:07 +0000 (15:23 +0200)]
Make the scrollUpdate test function work.

We could sometimes have more than two paint events even before reaching
QTRY_COMPARE, thus it would fail.
The test failed on Windows.

9 years agoFix a bug in FocusScopes; ensure subFocus is set correctly.
Andreas Aardal Hanssen [Tue, 15 Sep 2009 13:12:52 +0000 (15:12 +0200)]
Fix a bug in FocusScopes; ensure subFocus is set correctly.

The bug was triggered by setting focus on a parent scope (which then
passes focus to the innermost scope). Subfocus was set up for the
first scope, but not the inner scopes.

Reviewed-by: TrustMe
9 years agoRemove unused signal declaration.
Andreas Aardal Hanssen [Tue, 15 Sep 2009 13:02:36 +0000 (15:02 +0200)]
Remove unused signal declaration.

This came in with change c8bf9bd17a4520eefe4306b7b1bb4f93fb296d80, by
accident - it was a leftover after debugging.

Reviewed-by: Martin Smith
9 years agoRemoved a debug output that was a bit annoying
Thorbjørn Lindeijer [Tue, 15 Sep 2009 13:07:57 +0000 (15:07 +0200)]
Removed a debug output that was a bit annoying

Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
9 years agodoc: Fixed some qdoc errors.
Martin Smith [Tue, 15 Sep 2009 12:55:13 +0000 (14:55 +0200)]
doc: Fixed some qdoc errors.

9 years agoWhen parsing a java file do not simply ignore the first character.
Jan-Arve Sæther [Tue, 15 Sep 2009 12:33:18 +0000 (14:33 +0200)]
When parsing a java file do not simply ignore the first character.

If the file started with a comment (/* .. */) the parser would not see
the first '/' character, thus it would not treat it as a comment.

This was because we called getChar() just before we called parse(),
and just after we had entered parse().

9 years agoFix linenumbers.
Jan-Arve Sæther [Tue, 15 Sep 2009 12:32:40 +0000 (14:32 +0200)]
Fix linenumbers.

9 years agoRemoved GL1 pixmap filters and ported colorize filter to GL2 engine.
Samuel Rødal [Tue, 15 Sep 2009 12:19:57 +0000 (14:19 +0200)]
Removed GL1 pixmap filters and ported colorize filter to GL2 engine.

The GL1 engine will use the raster fall back for pixmap filters. We
anyhow use GLSL for the filters, which requires OpenGL 2 support, and in
that case the GL2 engine is the default.

Reviewed-by: Gunnar Sletta
9 years agoQNativeSocketEngine on Windows: don't bail out on non-fatal error
Peter Hartmann [Tue, 15 Sep 2009 11:04:11 +0000 (13:04 +0200)]
QNativeSocketEngine on Windows: don't bail out on non-fatal error

receiving the WSAEMSGSIZE error means we could not read all the data
because the buffer was too small, but still we should return the number
of bytes read and not return -1

Reviewed-by: Marius Storm-Olsen
9 years agoDon't do pixel tests in QGraphicsEffect on other than 32-bit display.
Ariya Hidayat [Tue, 15 Sep 2009 10:14:03 +0000 (12:14 +0200)]
Don't do pixel tests in QGraphicsEffect on other than 32-bit display.

Reviewed-by: Paul Olav Tvete
9 years agoFix ambiguous overload for QTileRules constructor
Olivier Goffart [Tue, 15 Sep 2009 12:19:43 +0000 (14:19 +0200)]
Fix ambiguous overload for QTileRules constructor

Also fix the relations in the documentation

Reviewed-by: David Boddie
9 years agoDoc: Added some snippets to the multimedia audio docs.
Geir Vattekar [Tue, 15 Sep 2009 11:01:45 +0000 (13:01 +0200)]
Doc: Added some snippets to the multimedia audio docs.

9 years agoMade QGraphicsBlurEffect use the high blur quality setting.
Samuel Rødal [Tue, 15 Sep 2009 10:35:17 +0000 (12:35 +0200)]
Made QGraphicsBlurEffect use the high blur quality setting.

This greatly increases the blur quality in the OpenGL implementation,
and doesn't affect the performance of the raster implementation.

Reviewed-by: Bjørn Erik Nilsen
9 years agoFixed QLineEdit to pass the tst_QLineEdit::displayText() autotest.
Kim Motoyoshi Kalland [Tue, 15 Sep 2009 10:32:42 +0000 (12:32 +0200)]
Fixed QLineEdit to pass the tst_QLineEdit::displayText() autotest.

Fetch the correct password character from the style.

Reviewed-by: Olivier
9 years agoFixed rendering errors in blurpicker with -graphicssystem opengl
Samuel Rødal [Tue, 15 Sep 2009 10:27:37 +0000 (12:27 +0200)]
Fixed rendering errors in blurpicker with -graphicssystem opengl

1) Need to transfer to brush drawing mode when switching active engine,
to make sure we reset the vertex / texture coordinate pointers for image

2) QGLPixmapGLPaintDevice::beginPaint() was changed to use
QGLContext::drawTexture() for blitting the old texture contents to the
render FBO, which means that we also need to set up viewport, modelview,
and projection matrices, and ensure that clipping / stencil testing
is disabled.

3) Make sure stencil testing is disabled when clearing the FBO.

Reviewed-by: Tom
9 years agodoc: Fixed some qdoc errors.
Martin Smith [Tue, 15 Sep 2009 10:05:50 +0000 (12:05 +0200)]
doc: Fixed some qdoc errors.

9 years agoExport again qt_set_sequence_auto_mnemonic
Olivier Goffart [Tue, 15 Sep 2009 10:02:19 +0000 (12:02 +0200)]
Export again qt_set_sequence_auto_mnemonic

Became unexported from commit bcd23411c8

Task-number: 261250

9 years agoMake test pass on Windows
Paul Olav Tvete [Tue, 15 Sep 2009 09:44:42 +0000 (11:44 +0200)]
Make test pass on Windows

Reviewed-by: Jan-Arve