9 years agoMerge branch '4.6' master-stable
Olivier Goffart [Thu, 10 Sep 2009 19:50:15 +0000 (21:50 +0200)]
Merge branch '4.6'

9 years agoFix the signal output in QObject::dumpObjectInfo
Olivier Goffart [Thu, 10 Sep 2009 19:46:30 +0000 (21:46 +0200)]
Fix the signal output in QObject::dumpObjectInfo

The computation of the offset was wrong.
(The offset is the difference between the method index, and the signal

Reviewed-by: trustme
9 years agoDoc: Updated the Qt for Embedded Platforms page.
David Boddie [Thu, 10 Sep 2009 18:00:19 +0000 (20:00 +0200)]
Doc: Updated the Qt for Embedded Platforms page.

Reviewed-by: Trust Me
9 years agoFixes regression in QStyleSheet regarding QFrame:no-frame
Olivier Goffart [Thu, 10 Sep 2009 16:25:46 +0000 (18:25 +0200)]
Fixes regression in QStyleSheet regarding QFrame:no-frame

In Qt know the frame is drawn in PE_Widget with stylesheet. But the
QStyleOption passed by QWidgetPrivate::drawBackground is really simple
and doesn't contains frame information.

We need to rely on the widget itself to know if we should look for the
:no-frame pseudo element.

Reviewed-by: jbache
Task-number: 261110

9 years agoQLocalSocket::readData (Windows) must return -1 on EOF
Joerg Bornemann [Thu, 10 Sep 2009 15:48:17 +0000 (17:48 +0200)]
QLocalSocket::readData (Windows) must return -1 on EOF

If we've detected a broken pipe and we have no more data in the
read buffer, then we return -1 to signal EOF.
Additionally, we close the QLocalSocket.

Reviewed-by: ossi
9 years agoQLocalSocket Windows: emit readChannelFinished if broken pipe detected
Joerg Bornemann [Thu, 10 Sep 2009 15:46:11 +0000 (17:46 +0200)]
QLocalSocket Windows: emit readChannelFinished if broken pipe detected

If we detect in a read operation that the pipe has been closed,
we must emit the readChannelFinished signal.

Reviewed-by: ossi
9 years agomake tst_QLocalSocket::writeToClientAndDisconnect more robust
Joerg Bornemann [Thu, 10 Sep 2009 14:59:58 +0000 (16:59 +0200)]
make tst_QLocalSocket::writeToClientAndDisconnect more robust

We must wait until all data is written before trying to read stuff.

Reviewed-by: ossi
9 years agorestoring a minimized window on Windows CE didn't work
Joerg Bornemann [Thu, 10 Sep 2009 14:01:20 +0000 (16:01 +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


9 years agoFixed a leak in lance that could cause crashes on exit.
Trond Kjernåsen [Thu, 10 Sep 2009 15:25:36 +0000 (17:25 +0200)]
Fixed a leak in lance that could cause crashes on exit.

Reviewed-by: Kim
9 years agoS60 font db more tolerant of failure
mread [Thu, 10 Sep 2009 15:07:56 +0000 (16:07 +0100)]
S60 font db more tolerant of failure

This now loads the fonts it can and asserts that at least one is
loaded, rather than requiring all fonts to load.

Reviewed-by: Alessandro Portale
9 years agoQTextDocument::contentsChanged() was emitted twice for a single
mae [Thu, 10 Sep 2009 14:44:17 +0000 (16:44 +0200)]
QTextDocument::contentsChanged() was emitted twice for a single

This was caught by the QSyntaxHighlighter autotest.

Reviewed-by: Paul
9 years agoFix compilation with winscw
Simon Hausmann [Thu, 10 Sep 2009 14:41:08 +0000 (16:41 +0200)]
Fix compilation with winscw

Winscw gets very confused when the name of an enum value is the same as
the name of an entire namespace, JSC in this case. Renaming the enum
value to JavaScriptCore fixes this.

Rubber-stamped-by: Kent
9 years agoRe-order begin() so everything needing a current context has one
Tom Cooksey [Thu, 10 Sep 2009 13:56:11 +0000 (15:56 +0200)]
Re-order begin() so everything needing a current context has one

It should be up to QGLPaintDevice::beginPaint() to make the correct
context current, so everything needing a current context needs to be
moved after that call.

This patch also modifies QGLPixmapData to use QGLContext::drawTexture
rather than the GL2 PE's drawTexture, which shouldn't be called inside
beginPaint as the paint engine hasn't been fully initialised yet.

Reviewed-by: Eskil
9 years agoDoc: Documented the standard keys in item views.
Geir Vattekar [Thu, 10 Sep 2009 13:46:16 +0000 (15:46 +0200)]
Doc: Documented the standard keys in item views.

Task-number: 212278
Reviewed-by: David Boddie
9 years agoDoc: Fixed snippet bug in stylesheet docs
Geir Vattekar [Thu, 10 Sep 2009 11:43:24 +0000 (13:43 +0200)]
Doc: Fixed snippet bug in stylesheet docs

Task-number: 241222
Reviewed-by: Trust Me
9 years agoUpdate installation instructions for building for Symbian
Shane Kearns [Thu, 10 Sep 2009 13:19:49 +0000 (15:19 +0200)]
Update installation instructions for building for Symbian

Add MinGW to list of tools people need to build the tools.
Update RVCT version from 616->686
Include instructions for building with raptor

Reviewed-by: Jason Barron
9 years agoMake test pass on QWS
Paul Olav Tvete [Thu, 10 Sep 2009 11:59:03 +0000 (13:59 +0200)]
Make test pass on QWS

Reviewed-by: jbarron
9 years agoFixed rendering of text with gradient pen in GL 2 engine.
Samuel Rødal [Thu, 10 Sep 2009 11:38:58 +0000 (13:38 +0200)]
Fixed rendering of text with gradient pen in GL 2 engine.

We should bind the text mask texture after calling prepareForDraw(),
since prepareForDraw() might need to initialize the gradient texture,
which means the text mask will no longer be bound.

Task-number: 261058
Reviewed-by: Kim
9 years agoFixed crash in raster paint engine.
Samuel Rødal [Thu, 10 Sep 2009 10:26:37 +0000 (12:26 +0200)]
Fixed crash in raster paint engine.

If m_element_types is empty then we should create a QVectorPath without
element types as well.

Reviewed-by: Gunnar
9 years agoWrong opacity set on the painter in QGraphicsEffect::draw.
Bjørn Erik Nilsen [Thu, 10 Sep 2009 11:21:48 +0000 (13:21 +0200)]
Wrong opacity set on the painter in QGraphicsEffect::draw.

We have to initialize the painter with the 'effected' item's
opacity before calling QGraphicsEffect::draw; otherwise we'll
use the previous rendered item's opacity (which is wrong).

Reviewed-by: Michael Brasser
9 years agoFixed white-space handling in the SVG module.
Kim Motoyoshi Kalland [Thu, 10 Sep 2009 10:11:56 +0000 (12:11 +0200)]
Fixed white-space handling in the SVG module.

When parsing lists, only space characters were treated as white-space.
Now, carrige returns, line feeds and tabs are also treated as white-
space as described in the SVG Tiny 1.2 specification.

Task-number: 260799
Reviewed-by: Tor Arne
9 years agoAdd an autotest for QGLWidget::renderPixmap()
Tom Cooksey [Thu, 10 Sep 2009 09:48:52 +0000 (11:48 +0200)]
Add an autotest for QGLWidget::renderPixmap()

9 years agoMade raster respect SmoothPixmapTransform and Antialiasing hints better.
Samuel Rødal [Thu, 10 Sep 2009 08:00:00 +0000 (10:00 +0200)]
Made raster respect SmoothPixmapTransform and Antialiasing hints better.

SmoothPixmapTransform shouldn't imply Antialiasing for image / pixmap
drawing, since the render hints are fully orthogonal.

Task-number: 256967
Reviewed-by: Trond
9 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Iain [Thu, 10 Sep 2009 10:02:32 +0000 (12:02 +0200)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

9 years agoRemove (out-of-date) DEF files for Symbian winscw build.
Iain [Thu, 10 Sep 2009 10:00:13 +0000 (12:00 +0200)]
Remove (out-of-date) DEF files for Symbian winscw build.

These hadn't been updated since they were frozen against Tower (or
a build close to the one used for Tower) so they're out of date
and therefore useless.

They'll reappear when we have a DEF file strategy.

RevBy: Jason Barron

9 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Morten Sorvig [Thu, 10 Sep 2009 09:59:32 +0000 (11:59 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6

9 years agoFix focus policy propagation in QCompleter on QWS
Paul Olav Tvete [Thu, 10 Sep 2009 09:34:39 +0000 (11:34 +0200)]
Fix focus policy propagation in QCompleter on QWS

setParent(0) can change the focus policy, so let's retrieve the original
value a bit earlier.

Reviewed-by: jasplin
9 years agoEnable Qt3Support for Qt/Cocoa on Mac OS X.
Morten Sorvig [Thu, 10 Sep 2009 09:53:31 +0000 (11:53 +0200)]
Enable Qt3Support for Qt/Cocoa on Mac OS X.

Qt on Mac OS X should not be the only desktop platform
without Qt3Support once the Carpon port is dropped. This
will also make the switch from Carbon to Cocoa-based Qt
as smooth as possible.

This is a minimal port, with some code removed:
Q3FileDialog is gone.
Q3MainWindow won't get the "hide toolbar" button.
Q3ScrollView might to more updates than structly neccesary.

The rest is there, including the QT3_SUPPORT functions
in QtCore and QtGui.

9 years agoUpload texturedata in matching internal format..
Gunnar Sletta [Thu, 10 Sep 2009 09:44:28 +0000 (11:44 +0200)]
Upload texturedata in matching internal format..

Reviewed-by: Tom
9 years agoDon't yinvert pixmaps on eglx11
Gunnar Sletta [Thu, 10 Sep 2009 09:43:47 +0000 (11:43 +0200)]
Don't yinvert pixmaps on eglx11

Reviewed-by: Tom
9 years agoFix random selection when the order is descending.
Alexis Menard [Thu, 10 Sep 2009 09:40:42 +0000 (11:40 +0200)]
Fix random selection when the order is descending.

This commit fix the random selection that appear when the sort is not
ascending. The problem is that sometimes the sort is not yet made (timer
is not yet fired) so the visible children list contains both sorted items
and non sorted items (at the end). translateVisibleLocation was buggy
assuming that the list is always sorted. We have now a dirty index that
indicate where the dirty items start. And then when the sort is made
the dirty index is reset. I have added auto-test for that and fix one
that was broken for Mac. The new version of the auto-test showed a crash
because of this broken selection.


9 years agoFix crash in gl2 paint engine on Windows
Eskil Abrahamsen Blomfeldt [Thu, 10 Sep 2009 09:08:46 +0000 (11:08 +0200)]
Fix crash in gl2 paint engine on Windows

wglGetProcAddress() on Windows requires a current context. Since there
was none, the resolution of GL extensions would silently fail, the
function pointers would be null and when we tried to use them later we
would get a crash (e.g. in startup of PadNavigator.) I've added an
assert to make the cause of the crash clearer, and a makeCurrent() to
fix the crash.

Reviewed-by: Tom
9 years agoMerge branch '4.6'
Olivier Goffart [Thu, 10 Sep 2009 09:07:19 +0000 (11:07 +0200)]
Merge branch '4.6'

9 years agoStabilize Graphics View tests
Olivier Goffart [Thu, 10 Sep 2009 09:03:11 +0000 (11:03 +0200)]
Stabilize Graphics View tests

Reviewed-by: Jesper
9 years agoStabilize some tests.
Olivier Goffart [Thu, 10 Sep 2009 08:17:26 +0000 (10:17 +0200)]
Stabilize some tests.

For the QFontMetrics test, the different way of computing the with of a
text returs different value (1 to 2 pixel difference).
So we need to make sure to use the same way to compute the with that the
one used to ellide.

9 years agoFixed handling of stop-color="currentColor" in the SVG module.
Kim Motoyoshi Kalland [Thu, 10 Sep 2009 08:39:42 +0000 (10:39 +0200)]
Fixed handling of stop-color="currentColor" in the SVG module.

The 'color' attribute is now explicitly parsed for gradient nodes.

Task-number: 260921
Reviewed-by: Trond
9 years agoMerge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Miikka Heikkinen [Thu, 10 Sep 2009 08:39:39 +0000 (11:39 +0300)]
Merge branch '4.6' of git@scm.dev.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, 10 Sep 2009 08:38:21 +0000 (10:38 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6

9 years agoMake static builds work fot Qt/Cocoa.
Morten Sorvig [Thu, 10 Sep 2009 08:34:22 +0000 (10:34 +0200)]
Make static builds work fot Qt/Cocoa.

Add -all_load to make Objective-C categories work.
Enable hide_symbols to remove visibility issues.

9 years agoFixed various PlatSec violations when app had no AllFiles capability.
Miikka Heikkinen [Thu, 10 Sep 2009 08:27:13 +0000 (11:27 +0300)]
Fixed various PlatSec violations when app had no AllFiles capability.

Fixed QtCore in various places that caused Platform Security
violations in Symbian if AllFiles capability was missing from the
application. All of these these were caused by trying to access /private
folder unnecessarily, either by Qt code or Open C.

Task-number: 249008
Reviewed-by: Janne Koskinen
9 years agoAutotest fix for QMainWindow
Thierry Bastian [Thu, 10 Sep 2009 07:54:28 +0000 (09:54 +0200)]
Autotest fix for QMainWindow

On embedded, the size of the screen is too small to leave enough space
for the dock widgets.

9 years agoAdd a layout in the demo it looks better.
Alexis Menard [Thu, 10 Sep 2009 07:57:32 +0000 (09:57 +0200)]
Add a layout in the demo it looks better.


9 years agoMake exception safety test work with XML output and warnings
mread [Thu, 10 Sep 2009 07:40:54 +0000 (08:40 +0100)]
Make exception safety test work with XML output and warnings

The QTestLib XML output system throws exceptions when the system is
out of memory, which is normally quite reasonable. However when it is
used to report warnings during a catch block, this terminates the
program. So this change temporarily disables allocation failures while
the warning is being recorded.

Reviewed-by: Jason Barron
9 years agoCompile
Paul Olav Tvete [Thu, 10 Sep 2009 07:24:59 +0000 (09:24 +0200)]

Reviewed-by: Jeremy Katz
9 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Rhys Weatherley [Thu, 10 Sep 2009 07:02:06 +0000 (17:02 +1000)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

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

This has one known use case: compiling with the 10.4u SDKi on 10.6.

9 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Rhys Weatherley [Thu, 10 Sep 2009 06:31:27 +0000 (16:31 +1000)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

9 years agoReturn the correct QGLFormat to the OpenGL1 paint engine for FBO's
Rhys Weatherley [Thu, 10 Sep 2009 06:28:20 +0000 (16:28 +1000)]
Return the correct QGLFormat to the OpenGL1 paint engine for FBO's

QGLPaintDevice::format() was returning the context's format, not
the format of the window surface's FBO.  This caused the OpenGL1
paint engine to think that the window didn't have depth and
stencil buffers, even though the FBO most certainly did.

This change makes QGLPaintDevice::format() virtual and overrides it
in QGLFBOGLPaintDevice to return an updated format that includes
the context parameters plus the extra features that the FBO supports.

Reviewed-by: Tom Cooksey
9 years agoFixed crash on shutdown with GL when leaking QGLWidgets
Gunnar Sletta [Thu, 10 Sep 2009 05:24:55 +0000 (07:24 +0200)]
Fixed crash on shutdown with GL when leaking QGLWidgets

The problem was the QGLContextResource destructor which was called
when the QtOpenGL dll was unloaded. At this point in time, the gl
driver had already been unloaded so any gl calls at this point in time
would crash. It is simply wrong for the destructor to try to clean up,
so we instead output a warning if resources are leaked.

9 years agoFixed tst_selftests failure.
Rohan McGovern [Thu, 10 Sep 2009 03:41:51 +0000 (13:41 +1000)]
Fixed tst_selftests failure.

It's acceptable for the exceptionthrow test to output:
 terminate called after throwing an instance of `int'

9 years agoFix a bug with mouse events in DirectFB
Anders Bakken [Thu, 10 Sep 2009 01:39:19 +0000 (18:39 -0700)]
Fix a bug with mouse events in DirectFB

Partially revert a974ce81d6324d8d85ade0153b5ce7c757ba4fdf. It seems odd
to just ignore the actual data in the input event but when the layer and
the event differs the layer is correct.

Reviewed-by: TrustMe
9 years agoDWDESC_OPTIONS was added for DirectFB 1.1
Anders Bakken [Thu, 10 Sep 2009 01:08:32 +0000 (18:08 -0700)]
DWDESC_OPTIONS was added for DirectFB 1.1

Reviewed-by: TrustMe
Anders Bakken [Thu, 10 Sep 2009 02:28:52 +0000 (19:28 -0700)]

This will make DirectFB version tests work.

Reviewed-by: TrustMe
9 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Rhys Weatherley [Thu, 10 Sep 2009 01:24:00 +0000 (11:24 +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 [Thu, 10 Sep 2009 01:23:09 +0000 (11:23 +1000)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

9 years agoFixes another SQL Server autotest result.
Bill King [Thu, 10 Sep 2009 01:18:12 +0000 (11:18 +1000)]
Fixes another SQL Server autotest result.

9 years agoFix font glyph handling for QPF fonts in the OpenGL1 paint engine.
Rhys Weatherley [Thu, 10 Sep 2009 01:14:47 +0000 (11:14 +1000)]
Fix font glyph handling for QPF fonts in the OpenGL1 paint engine.

Text drawing on OpenGL/ES 1.1 systems using QPF was displaying filled
boxes in place of the character glyphs.  This is due to the QPF
implementation of alphaMapForGlyph() returning a different
color table than that expected by QGLGlyphCache::cacheGlyphs().

Reviewed-by: Sarah Smith
9 years agoUse fromLatin1() in QDirectFBScreen::connect()
Anders Bakken [Wed, 9 Sep 2009 23:55:11 +0000 (16:55 -0700)]
Use fromLatin1() in QDirectFBScreen::connect()

Avoid warning when building DirectFB as part of Qt.

Reviewed-by: TrustMe
9 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Rhys Weatherley [Wed, 9 Sep 2009 23:06:23 +0000 (09:06 +1000)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

9 years agoCompile fix for OpenGL/ES 1.1 CommonLite systems
Rhys Weatherley [Wed, 9 Sep 2009 23:05:46 +0000 (09:05 +1000)]
Compile fix for OpenGL/ES 1.1 CommonLite systems

Reviewed-by: trustme
9 years agoSuppress warnings in QtOpenGL on OpenGL/ES 1.1 systems
Rhys Weatherley [Wed, 9 Sep 2009 22:51:35 +0000 (08:51 +1000)]
Suppress warnings in QtOpenGL on OpenGL/ES 1.1 systems

Reviewed-by: trustme
9 years agoCrash in audiooutput demo when switching output
Kurt Korbatits [Wed, 9 Sep 2009 22:47:18 +0000 (08:47 +1000)]
Crash in audiooutput demo when switching output
-waveOut callback was calling into class during destruction.
Changed to wait until close of waveOut/waveIn before returning from
-Reduced default buffer on wince implementation.
-Added error checking on buffer allocation.

Task-number:261049, 261053
Reviewed-by:Bill King

9 years agoCompile fix for OpenGL/ES 1.1 systems
Rhys Weatherley [Wed, 9 Sep 2009 22:35:03 +0000 (08:35 +1000)]
Compile fix for OpenGL/ES 1.1 systems

Reviewed-by: trustme
9 years agoDocument why an FBO of 0 needs to be bound in QGLPaintBuffer sometimes
Rhys Weatherley [Wed, 9 Sep 2009 22:12:45 +0000 (08:12 +1000)]
Document why an FBO of 0 needs to be bound in QGLPaintBuffer sometimes

Reviewed-by: trustme
9 years agoMake QGraphicsSvgItem a QGraphicsObject.
Alexis Menard [Wed, 9 Sep 2009 17:23:38 +0000 (19:23 +0200)]
Make QGraphicsSvgItem a QGraphicsObject.

This item was inheriting from QObject and QGraphicsItem so there is
no point to not make it a QGraphicsObject. I have added some properties
that was specific to this class, i.e. elementId.

Reviewed-by: ogoffart
Reviewed-by: andreas
Reviewed-by: bnilsen
9 years agoFix incorrect fallback for icon themes
Jens Bache-Wiig [Wed, 9 Sep 2009 17:08:07 +0000 (19:08 +0200)]
Fix incorrect fallback for icon themes

When using themed icons, we incorrectly used the systemTheme
as the fallback. This is not correct as the idea of the fallback
was to use the generic "gnome" or "oxygen" themes if the
proper theme was not available.

Reviewed-by: joao
9 years agoCompile
Anders Bakken [Wed, 9 Sep 2009 16:05:14 +0000 (09:05 -0700)]

Partially revert 6715f2f29ae413b328243d8c3dbe15cfba51d33f

struct QWSServerCleaner { ~QWSServerCleaner(); } is not a function.

Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
9 years agoDoc: First part of my review of the gestures overview.
David Boddie [Wed, 9 Sep 2009 15:57:09 +0000 (17:57 +0200)]
Doc: First part of my review of the gestures overview.

Reviewed-by: Trust Me
9 years agoFix QtScript compilation against external JSC sources
Simon Hausmann [Wed, 9 Sep 2009 14:21:38 +0000 (16:21 +0200)]
Fix QtScript compilation against external JSC sources

Print a message when doing so and don't re-define qmake functions that
come from JavaScriptCore.pri.

Reviewed-by: Trust me
9 years agotests/auto/qfiledialog/qfiledialog.pro fixed
Joerg Bornemann [Wed, 9 Sep 2009 15:45:45 +0000 (17:45 +0200)]
tests/auto/qfiledialog/qfiledialog.pro fixed

Reviewed-by: thartman
9 years agotests/auto/qdirmodel/qdirmodel.pro fixed
Joerg Bornemann [Wed, 9 Sep 2009 15:40:23 +0000 (17:40 +0200)]
tests/auto/qdirmodel/qdirmodel.pro fixed

Reviewed-by: thartman
9 years agotests/auto/qfile/test/test.pro fixed
Joerg Bornemann [Wed, 9 Sep 2009 15:33:27 +0000 (17:33 +0200)]
tests/auto/qfile/test/test.pro fixed

Reviewed-by: thartman
9 years agotests/auto/qdir/qdir.pro fixed after destroying it during Symbian merge
Joerg Bornemann [Wed, 9 Sep 2009 15:25:21 +0000 (17:25 +0200)]
tests/auto/qdir/qdir.pro fixed after destroying it during Symbian merge

Reviewed-by: thartman
9 years agoDoc: Updated the license information for Phonon.
David Boddie [Wed, 9 Sep 2009 15:49:19 +0000 (17:49 +0200)]
Doc: Updated the license information for Phonon.

Reviewed-by: Trust Me
Really-reviewed-by: Legal
9 years agoDoc: Note that Netscape plugins are only available on desktop platforms.
David Boddie [Wed, 9 Sep 2009 11:36:01 +0000 (13:36 +0200)]
Doc: Note that Netscape plugins are only available on desktop platforms.

Reviewed-by: Takumi Asaki
Will-also-be-applied-to: 4.5

9 years agoFix crash (assert) in QTextDocument
mae [Wed, 9 Sep 2009 15:42:07 +0000 (17:42 +0200)]
Fix crash (assert) in QTextDocument

When loading binary files as text, QTextCursor did not check for
beginning and end of frame (QChar(0xfdd0) and QChar(0xfdd1)), while
QTextDocument asserted that those characters were absent.

The patch makes QTextCursor::insertText() treat frame bounderies like
paragraph separators.

Reviewed-by: ck
9 years agoAccount for right bearing in QFontMetrics::boundingRect(string)
Eskil Abrahamsen Blomfeldt [Wed, 9 Sep 2009 15:38:57 +0000 (17:38 +0200)]
Account for right bearing in QFontMetrics::boundingRect(string)

QFontMetrics::boundingRect() that takes a string needs to account for
the right bearing of the last glyph, as it is documented to be the
rectangle that contains the pixels of the text. I've added a test for
this, and fixed tst_QFontMetrics::elidedText() to use boundingRect() to
find the actual width of the text drawn (width() will return the advance
of the text, which is larger than the actual width of the pixels.)

I've also fixed a small typo in the "len" -> "ilen".

Reviewed-by: Simon Hausmann
9 years agoFixed text positioning in SVGs when using SVG fonts.
Kim Motoyoshi Kalland [Wed, 9 Sep 2009 15:18:41 +0000 (17:18 +0200)]
Fixed text positioning in SVGs when using SVG fonts.

Task-number: 260920
Reviewed-by: Trustme
9 years agoFix crash/bug in QGraphicsItem's subFocus handling.
Andreas Aardal Hanssen [Wed, 9 Sep 2009 15:10:58 +0000 (17:10 +0200)]
Fix crash/bug in QGraphicsItem's subFocus handling.

Removes dangling subFocusItem pointers when changing focus after
reparenting. This change also includes a mini-optimization when adding
focusable items to an inactive scene.

Reviewed-by: brad
9 years agoOnly active QGraphicsScenes can have active input focus.
Andreas Aardal Hanssen [Wed, 9 Sep 2009 08:01:10 +0000 (10:01 +0200)]
Only active QGraphicsScenes can have active input focus.

This change ensures that only active scenes can have active input
focus items. If you try to set input focus on items that are in an
inactive scene, these items will gain input focus only when the scene
is activated.

For scenes attached to a view, this change should only fix the bug that
you could have a blinking line edit in a scene when the view is inactive,
meaning you couldn't type into the line edit.

For scenes that have no view, you now must activate the scene in order
to give the items active input focus. This will affect those who use
QGraphicsScene with custom key and focus handling.

Reviewed-by: brad
9 years agoRemove ItemAutoDetectsFocusProxy from QGraphicsItem.
Andreas Aardal Hanssen [Tue, 8 Sep 2009 08:21:29 +0000 (10:21 +0200)]
Remove ItemAutoDetectsFocusProxy from QGraphicsItem.

This change partially reverts f68fed388dcdba6ab6dad3af4933bcd3aa123cf8,
which was an attempt at getting FocusRealms working. Turns out this
approach is wrong. The flag behaves badly when reparenting, and the
feature conflicts with plain old setting focus.

Discussed with Aaron; this change was already reverted in the
kinetic-declarativeui branch.

Reviewed-by: TrustMe
9 years agoMake QtOpenGL link against EGL for OpenGL ES
Tom Cooksey [Tue, 8 Sep 2009 10:46:56 +0000 (12:46 +0200)]
Make QtOpenGL link against EGL for OpenGL ES

Previously, QtOpenGL assumed that by linking against QtGui, it would
automatically also be linked against EGL. However, this is no longer the
case after 83940f25dba51a9942ab55ed8475fc7fc8a8da84 which makes sure
only QtGui links against EGL and not other libs/apps linking against

Reviewed-by: Rhys Weatherley
9 years agoSome unneeded semicolons less
Alessandro Portale [Wed, 9 Sep 2009 15:08:52 +0000 (17:08 +0200)]
Some unneeded semicolons less

9 years agoRemoved some superfluous semicolons
Alessandro Portale [Tue, 8 Sep 2009 15:58:17 +0000 (17:58 +0200)]
Removed some superfluous semicolons

Reviewed-by: TrustMe
9 years agoUpdated the pbuffers2 example to make it work with the GL2 engine.
Kim Motoyoshi Kalland [Wed, 9 Sep 2009 14:23:19 +0000 (16:23 +0200)]
Updated the pbuffers2 example to make it work with the GL2 engine.

Added begin/endNativePainting() calls.

Reviewed-by: Trond
9 years agoFixed a bug in the GL1 engine when using a QBrush(Qt::NoBrush) as a pen.
Trond Kjernåsen [Wed, 9 Sep 2009 14:20:08 +0000 (16:20 +0200)]
Fixed a bug in the GL1 engine when using a QBrush(Qt::NoBrush) as a pen.

This bug was exposed by a change in the QSvg module, and it
fixes the framebufferobject and pbuffers2 GL examples.

Reviewed-by: Kim
9 years agoskip tst_qscriptdebugger on Windows CE < 6
Joerg Bornemann [Wed, 9 Sep 2009 14:16:18 +0000 (16:16 +0200)]
skip tst_qscriptdebugger on Windows CE < 6

Currently the QScriptEngineDebugger uses far too much memory.
Until task 261062 is resolved, we skip these test cases.
Discussed with Kent.

9 years agoFix OpenGL ES 1.x after QGLPaintDevice refactor
Tom Cooksey [Wed, 9 Sep 2009 13:11:32 +0000 (15:11 +0200)]
Fix OpenGL ES 1.x after QGLPaintDevice refactor

QGLPixmapData needs to be #define'd out for OpenGL ES 1.x

Reviewed-by: Trustme
9 years agoFix crash of QtScript on Mac OS X
Simon Hausmann [Wed, 9 Sep 2009 14:15:49 +0000 (16:15 +0200)]
Fix crash of QtScript on Mac OS X

When compiling on 10.4 but running on 10.5 the flags passed to vm_map cause
it to crash.

For now fall back to the use of mmap() as allocator instead.

Reviewed-by: Kent Hansen
9 years agoDo not run the respectHFW autotest on all platforms.
Jan-Arve Sæther [Wed, 9 Sep 2009 14:10:42 +0000 (16:10 +0200)]
Do not run the respectHFW autotest on all platforms.

It fails on some platforms because of a bug in the autotest.
There might be more platforms also, but these are the ones
that currently report the problem.

Reviewed-by: paul
9 years agoStabilized QTableView test
Gabriel de Dietrich [Wed, 9 Sep 2009 13:54:11 +0000 (15:54 +0200)]
Stabilized QTableView test

This test would crash once in  while.

9 years agoStabilize QFontMetrics test
Gabriel de Dietrich [Wed, 9 Sep 2009 12:46:59 +0000 (14:46 +0200)]
Stabilize QFontMetrics test

Reviewed-by: Olivier
9 years agoAdded a standard copyright header to files generated by rcc.
Martin Smith [Wed, 9 Sep 2009 13:02:17 +0000 (15:02 +0200)]
Added a standard copyright header to files generated by rcc.

9 years agoMerge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Janne Anttila [Wed, 9 Sep 2009 12:47:30 +0000 (15:47 +0300)]
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6

9 years agotst_qhostinfo: Increased timeout
Markus Goetz [Wed, 9 Sep 2009 12:44:29 +0000 (14:44 +0200)]
tst_qhostinfo: Increased timeout

9 years agoAdded #ifdef Q_OS_SYMBIAN quard for ealier commit d78717e7
Janne Anttila [Wed, 9 Sep 2009 12:44:53 +0000 (15:44 +0300)]
Added #ifdef Q_OS_SYMBIAN quard for ealier commit d78717e7

9 years agoAdd missing \since 4.6 in the QMargins documentation
Olivier Goffart [Wed, 9 Sep 2009 12:34:58 +0000 (14:34 +0200)]
Add missing \since 4.6 in the QMargins documentation

9 years agoStabilize QFontMetrics test
Olivier Goffart [Wed, 9 Sep 2009 12:34:06 +0000 (14:34 +0200)]
Stabilize QFontMetrics test

9 years agoQMenubar could popup a menu when undocking a toolbar
Thierry Bastian [Wed, 9 Sep 2009 11:57:16 +0000 (13:57 +0200)]
QMenubar could popup a menu when undocking a toolbar

This is due to the fact that it receives a mousemoveevent.
But as it doesn't receive a mousepress event, we can detect whether it
should popup or not.

Task-number: 260873
Reviewed-by: prasanth
9 years agoFix unresolved reference to q_sk_free with openssl 1.0
Bernhard Rosenkraenzer [Wed, 9 Sep 2009 11:40:51 +0000 (13:40 +0200)]
Fix unresolved reference to q_sk_free with openssl 1.0

Previous fix introduced an unresolved reference in the lib

Merge-request: 1409
Reviewed-by: Peter Hartmann <peter.hartmann@trolltech.com>