qt:qt-gordons.git
8 years agoMake the default duration of pause animations 250ms
Thierry Bastian [Tue, 20 Oct 2009 10:48:24 +0000 (12:48 +0200)]
Make the default duration of pause animations 250ms

8 years agoMake the total duration of animation be 0 if duration is 0
Thierry Bastian [Tue, 20 Oct 2009 10:46:43 +0000 (12:46 +0200)]
Make the total duration of animation be 0 if duration is 0

8 years agoFix bug in embedded dialog demo with tab focus.
Alexis Menard [Tue, 20 Oct 2009 09:52:38 +0000 (11:52 +0200)]
Fix bug in embedded dialog demo with tab focus.

On embedded dialog pressing tab stop changing the focus when the focus
was given to QFontComboBox. It's because QFontComboBox embed a
QLineEdit in order to allow editing. But this QLineEdit is a focus proxy
so we need to special case that. The logic is the same in QApplication.
Be careful when changing one of them.

Task-number:QTBUG-4818
Reviewed-by:jan-arve
Reviewed-by:ogoffart

8 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Alexis Menard [Tue, 20 Oct 2009 09:08:39 +0000 (11:08 +0200)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

8 years agoRevert "Change the way we handle KeyboardUIMode on Mac"
Benjamin Poulain [Tue, 20 Oct 2009 09:08:04 +0000 (11:08 +0200)]
Revert "Change the way we handle KeyboardUIMode on Mac"
This will be handled differently (QTBUG-4751)

This reverts commit b12fb5861ce09539c04cd51db12a9bfbe32a4774.

8 years agoFixed wrong scrolling in QListView with hidden rows in ListMode
Gabriel de Dietrich [Tue, 20 Oct 2009 08:39:42 +0000 (10:39 +0200)]
Fixed wrong scrolling in QListView with hidden rows in ListMode

The flow positions in ScrollPerItem mode did not take the hidden rows into
account when configuring the vertical scroll bar.

A mapping between the scroll bar value and the flow position has been
added. Auto-test included.

Task-number: QTBUG-2233
Reviewed-by: Thierry
8 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Alexis Menard [Tue, 20 Oct 2009 08:46:31 +0000 (10:46 +0200)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

8 years agoQToolButton popup menu is shown at wrong position when embedded in a
Alexis Menard [Tue, 20 Oct 2009 08:39:56 +0000 (10:39 +0200)]
QToolButton popup menu is shown at wrong position when embedded in a
QGraphicsView.

The main problem here is that QWidget assume that they are in the screen
somewhere, which means inside the available geometry provided by
QDesktopWidget. But in QGraphicsView the button can be in a position
that is way bigger than the screen resolution. Lot of widgets make
this assumption when positionning subpopups or submenus. Instead of
applying the same code on tons of QWidgets, it's better to have an
helper function in desktop widget which catch this case. It's not
pretty (since it has nothing to do with QDesktopWidget) but we don't
have better solution.

Task-number:QTBUG-3822
Reviewed-by:brad

8 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6
Alexis Menard [Tue, 20 Oct 2009 08:28:49 +0000 (10:28 +0200)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6

8 years agoMerge branch 'mmfphonon' into 4.6
Frans Englich [Tue, 20 Oct 2009 07:48:26 +0000 (09:48 +0200)]
Merge branch 'mmfphonon' into 4.6

8 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Rhys Weatherley [Tue, 20 Oct 2009 06:55:54 +0000 (16:55 +1000)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

8 years agoThe shipped pvr2d.h/wsegl.h for PowerVR do not work with MBX
Rhys Weatherley [Tue, 20 Oct 2009 06:55:06 +0000 (16:55 +1000)]
The shipped pvr2d.h/wsegl.h for PowerVR do not work with MBX

Reviewed-by: trustme
8 years agoCocoa: modal window reappears on screen after reactivating app
Richard Moe Gustavsen [Sun, 18 Oct 2009 16:02:00 +0000 (18:02 +0200)]
Cocoa: modal window reappears on screen after reactivating app

If you close a modal window, then activate different app, then
activate app again, the window will pop non-modal in front.
This patch makes sure that when we hide a window, we point
to the next window to receive keyboard focus.

Rev-By: MortenS
8 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Rhys Weatherley [Tue, 20 Oct 2009 06:48:04 +0000 (16:48 +1000)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

8 years agoRemove unnecessary PowerVR helper functions
Rhys Weatherley [Tue, 20 Oct 2009 06:46:46 +0000 (16:46 +1000)]
Remove unnecessary PowerVR helper functions

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

Reviewed-by: trustme
8 years agoFix now invalid ExpectFail.
Bill King [Tue, 20 Oct 2009 03:51:06 +0000 (13:51 +1000)]
Fix now invalid ExpectFail.

The bug causing this fail is now fixed, so remove the expectfails.

8 years agoFix dangling shader manager pointers
Julian de Bhal [Tue, 20 Oct 2009 02:32:19 +0000 (12:32 +1000)]
Fix dangling shader manager pointers
The QGLEngineShaderManager pointers in QGLCustomShaderStagePrivate have
been changed to QPointers to prevent the QGLPixmapFilters in
QGL2PaintEngineEx from dereferencing the QGLEngineShaderManager after
it is destroyed.

Reviewed-by: Rhys Weatherley
8 years agoFix bug QTBUG-4848
Sarah Smith [Tue, 20 Oct 2009 01:53:30 +0000 (11:53 +1000)]
Fix bug QTBUG-4848

Make the shapeText function return numGlyphs properly - its not always
the same as length of string.

Task-number: QTBUG-4848
Reviewed-by: Rhys Weatherley
8 years agoMisc mysql test fixes.
Bill King [Tue, 20 Oct 2009 00:21:38 +0000 (10:21 +1000)]
Misc mysql test fixes.

8 years agoOptimize QVGPixmapDropShadowFilter by removing colorize step
Rhys Weatherley [Mon, 19 Oct 2009 23:00:02 +0000 (09:00 +1000)]
Optimize QVGPixmapDropShadowFilter by removing colorize step

Previously, the drop shadow was colorizing the incoming
image and then blurring the colorized version.  This change
first blurs the image to an alpha-only VGImage and then uses
that VGImage as a stencil to draw the drop shadow color.

This way, there is only 1 filter step and a draw instead of
2 filter steps and a draw.  The result is to make the performance
of the drop shadow filter almost identical to the blur filter.

Reviewed-by: trustme
8 years agoadd the autotest for the QListView::setModelColumn bug
Pierre Rossi [Mon, 19 Oct 2009 19:37:45 +0000 (21:37 +0200)]
add the autotest for the QListView::setModelColumn bug

sha1 of the fix: 2633931653757decd93dd3939c09f5e07203da1c

8 years agoFix a bug affecting keyboard navigation in the table view
Orgad Shaneh [Mon, 19 Oct 2009 09:59:20 +0000 (11:59 +0200)]
Fix a bug affecting keyboard navigation in the table view

Reviewed-by: thierry
Reviewed-by: pierre
8 years agofix widget activation from minimized state on Windows mobile
Joerg Bornemann [Mon, 19 Oct 2009 12:44:43 +0000 (14:44 +0200)]
fix widget activation from minimized state on Windows mobile

The following didn't work on Windows mobile:
   * show a widget normal (non-maximized)
   * minimize it
   * reactivate it via the file explorer
   * now the widget should be visible again

The code path from minimized to normal state was missing.

Reviewed-by: thartman
8 years agofix bug in tst_qwidget.cpp
Joerg Bornemann [Mon, 19 Oct 2009 12:19:56 +0000 (14:19 +0200)]
fix bug in tst_qwidget.cpp

WinIdChangeEventWidget::event didn't return a value in all codepaths.

Reviewed-by: thartman
8 years agoqwidget_wince.cpp: don't invalidate the crect on maximize
Joerg Bornemann [Mon, 19 Oct 2009 10:56:43 +0000 (12:56 +0200)]
qwidget_wince.cpp: don't invalidate the crect on maximize

If we do this, QWidget::width() returns negative sizes, which makes
QGraphicsView crash.

Reviewed-by: thartman
8 years agoqwindowsmobilestyle.cpp: endif comment fixed
Joerg Bornemann [Mon, 19 Oct 2009 11:55:01 +0000 (13:55 +0200)]
qwindowsmobilestyle.cpp: endif comment fixed

8 years agoQTestLib: do not assert if testLogger object is already destroyed
Peter Hartmann [Mon, 19 Oct 2009 14:20:23 +0000 (16:20 +0200)]
QTestLib: do not assert if testLogger object is already destroyed

... because when dumping signals we might get QThread::finished() etc.
when closing the program, and then the testLogger instance might
already be deleted.

Reviewed-by: Jesper
8 years agoDoes not disable full screen when end of video playlist is reached.
Frans Englich [Mon, 19 Oct 2009 10:04:57 +0000 (12:04 +0200)]
Does not disable full screen when end of video playlist is reached.

Tested on Symbian and Windows(DS9).

Task-number: QTBUG-4869
Reviewed-by: Gareth Stockwell
8 years agoReimplementing QDate/QTime/QDateTime in Symbian native manner
Aleksandar Sasha Babic [Mon, 19 Oct 2009 13:29:20 +0000 (15:29 +0200)]
Reimplementing QDate/QTime/QDateTime in Symbian native manner

Some of the methods used in QDate/QTime/QDateTime have been
reimplemented to use native Symbian calls.

Reviewed-by: Janne Anttila
8 years agoFix doc error.
Jason Barron [Mon, 19 Oct 2009 13:39:39 +0000 (15:39 +0200)]
Fix doc error.

Should *not* be used as a softkey.

Reviewed-by: TrustMe
8 years agoFixed the build for people who only have emulator binaries installed
axis [Mon, 19 Oct 2009 12:50:49 +0000 (14:50 +0200)]
Fixed the build for people who only have emulator binaries installed

RevBy:    mread

8 years agoFluidlauncher now comes to foreground when child application dies.
Miikka Heikkinen [Mon, 19 Oct 2009 12:46:35 +0000 (15:46 +0300)]
Fluidlauncher now comes to foreground when child application dies.

Task-number: QT-2162
Reviewed-by: axis
8 years agoFixed QWidget::raise in Symbian
Miikka Heikkinen [Mon, 19 Oct 2009 12:42:36 +0000 (15:42 +0300)]
Fixed QWidget::raise in Symbian

If toplevel window is raised, the whole application is now raised to
foreground.

Task-number: QT-2162
Reviewed-by: axis
8 years agosetcepaths: add support for wincewm65professional-msvc200? mkspecs
Joerg Bornemann [Mon, 19 Oct 2009 05:23:20 +0000 (07:23 +0200)]
setcepaths: add support for wincewm65professional-msvc200? mkspecs

Reviewed-by: mauricek
8 years agoQTestLib: do not assert if file is not given in logging function
Peter Hartmann [Mon, 19 Oct 2009 11:57:15 +0000 (13:57 +0200)]
QTestLib: do not assert if file is not given in logging function

that assert was triggered when running a test with "-vs" to show all the
signals emitted.

Reviewed-by: Andy Shaw
8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Gunnar Sletta [Mon, 19 Oct 2009 11:59:46 +0000 (13:59 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6

8 years agoFixed bad glyph rendering under cocoa
Gunnar Sletta [Mon, 19 Oct 2009 06:30:48 +0000 (08:30 +0200)]
Fixed bad glyph rendering under cocoa

The positioning is still wrong, but now it at least the glyphs are ok

Reviewed-by: msorvig
8 years agoqdoc3: Added the \qmlattachedproperty command.
Martin Smith [Mon, 19 Oct 2009 11:50:24 +0000 (13:50 +0200)]
qdoc3: Added the \qmlattachedproperty command.

It works just like the \qmlproperty command, except
that it puts the properties in a different section for
attached properties.

8 years agoRegression fix. Fix the hasUncaughtException() flag in debugger's event.
Jedrzej Nowacki [Mon, 19 Oct 2009 10:40:38 +0000 (12:40 +0200)]
Regression fix. Fix the hasUncaughtException() flag in debugger's event.

The QScriptEngine::hasUncaughtException() flag should be set to true if
returning from a JS function was caused by an exception. According to
documentation, the flag had to be accessible from the
QScriptEngineAgent::functionExit event.

New autotest was added.

Reviewed-by: Kent Hansen
8 years agoFix crash in QPixmapCache.
David Faure [Mon, 19 Oct 2009 11:24:21 +0000 (13:24 +0200)]
Fix crash in QPixmapCache.

QCache destruction accesses the key array that was freed in the QPixmapCache destruction, so better clear() before deleting that key.

Merge-request: 1820
Reviewed-by: Alexis Menard <alexis.menard@nokia.com>
8 years agoQSslSocket: Also handle setSocketOption
Markus Goetz [Mon, 19 Oct 2009 08:42:42 +0000 (10:42 +0200)]
QSslSocket: Also handle setSocketOption

Handle setSocketOption and forward it to the plainSocket that
QSslSocket is using internally.

Reviewed-by: Thiago
8 years agoMade sure the noSocketEvents value is preserved in case of exception.
axis [Mon, 19 Oct 2009 08:27:18 +0000 (10:27 +0200)]
Made sure the noSocketEvents value is preserved in case of exception.

Task:     QT-987
RevBy:    mread

8 years agoMade Mac Carbon use the input method hints when deciding on IM.
axis [Thu, 15 Oct 2009 14:18:19 +0000 (16:18 +0200)]
Made Mac Carbon use the input method hints when deciding on IM.

New behavior is to turn them off when inputting numbers or hidden
text, which is the way it was in Qt 4.5.

Task:     QT-1938
Task:     QT-2257
RevBy:    Prasanth Ullattil

8 years agoDo not loop forever if we are adding the layout itself to the layout.
Jan-Arve Sæther [Mon, 19 Oct 2009 07:39:30 +0000 (09:39 +0200)]
Do not loop forever if we are adding the layout itself to the layout.

Reviewed-by: alexis
8 years agoWhitespace cleanup.
Jan-Arve Sæther [Mon, 19 Oct 2009 07:25:12 +0000 (09:25 +0200)]
Whitespace cleanup.

8 years agoFix autotest case for QSoftkeyManager
Sami Merilä [Mon, 19 Oct 2009 07:23:30 +0000 (10:23 +0300)]
Fix autotest case for QSoftkeyManager

QSoftkeyManager's test case checkSoftkeyEnableStates was broken with
recent fix to QSoftkeyManager where softkey action is no longer
initialized to the initial state of action widget. Instead, softkey
action checks the state of action widget when handling the action.

Autotest case is now fixed to handle the change.

Task-number: N/A
Reviewed-by: Miikka Heikkinen
8 years agoRemove debug output.
Morten Johan Sørvig [Mon, 19 Oct 2009 06:23:48 +0000 (08:23 +0200)]
Remove debug output.

8 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Gunnar Sletta [Mon, 19 Oct 2009 06:19:14 +0000 (08:19 +0200)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

8 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Peter Yard [Mon, 19 Oct 2009 05:36:16 +0000 (15:36 +1000)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

8 years agoAdditional documentation added to deployment.qdoc which lists the process and links...
Peter Yard [Mon, 19 Oct 2009 05:33:23 +0000 (15:33 +1000)]
Additional documentation added to deployment.qdoc which lists the process and links to the original MSDN pages which describe it in full.

8 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Gunnar Sletta [Mon, 19 Oct 2009 04:58:20 +0000 (06:58 +0200)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

8 years agoODBC: Retrieved in ascii, should be stored in ascii.
Bill King [Mon, 19 Oct 2009 04:45:47 +0000 (14:45 +1000)]
ODBC: Retrieved in ascii, should be stored in ascii.
For non-unicode databases, use ascii.

Task-number: QTBUG-3736

8 years agoMerge branch '4.5' into 4.6
Thiago Macieira [Fri, 16 Oct 2009 16:24:19 +0000 (18:24 +0200)]
Merge branch '4.5' into 4.6

Conflicts:
src/gui/egl/qegl_symbian.cpp

8 years agoAPI addition: Make it possible to set the size policy of an anchor.
Jan-Arve Sæther [Fri, 16 Oct 2009 15:31:10 +0000 (17:31 +0200)]
API addition: Make it possible to set the size policy of an anchor.

After this commit, when you modify the spacing of an anchor you are
effectively modifying the preferred size of the anchor, since all
anchors (except internal ones) have their minimumSizeHint to 0 and
maximumSizeHint to QWIDGETSIZE_MAX.

I also changed the sizeHintsFromItem to be more generic so that I could
use it for anchors. (Thus, it was renamed to "internalSizeHints"). It
now only takes care of setting the min/pref/exp/maxSize of AnchorData
based on the anchor/item size hint and their size policies.

As a consequence of all of this, setFixedSize changed behaviour and
became setPreferredSize (since setSpacing is basically setPreferredSize).
The implementation of that now only sets the prefSize.

The patch also has an unrelated fix for IgnoreFlag, where it will
(again) return the minimumSize for sizeHint(Qt::PreferredSize) instead
of the maximumSize. This was to be more consistent with
qgridlayoutengine.cpp. The docs are not very clear on this behaviour
unfortunately.

This API change has been discussed.

Reviewed-by: alexis
8 years agoFixed crash in the Boxes demo when using -graphicssystem opengl.
Kim Motoyoshi Kalland [Fri, 16 Oct 2009 15:53:10 +0000 (17:53 +0200)]
Fixed crash in the Boxes demo when using -graphicssystem opengl.

QGLWindowSurface::flush() assumed that updateGeometry() had been
called, but in some cases it hadn't. It would therefore dereference a
null pointer and crash. This has been fixed by returning from flush()
if updateGeometry() has not been called. This fixes the symptom rather
than the bug, so we still need to find out why it hasn't been called.

Reviewed-by: Trond
8 years agoThis reverts commit 99739f35bf700a2bff707da99f5043cd7c12aed5.
Kim Motoyoshi Kalland [Fri, 16 Oct 2009 15:26:19 +0000 (17:26 +0200)]
This reverts commit 99739f35bf700a2bff707da99f5043cd7c12aed5.

Don't create native windows when setting the window title, delay the
creation until the native window is needed. If a user really needs the
window to be created, he/she can call winId() on the widget or set
Qt::AA_ImmediateWidgetCreation.

Reviewed-by: Bradley T. Hughes
8 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
David Boddie [Fri, 16 Oct 2009 15:21:37 +0000 (17:21 +0200)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

8 years agoKill warning, simplify code.
Frans Englich [Fri, 16 Oct 2009 14:31:27 +0000 (16:31 +0200)]
Kill warning, simplify code.

Reviewed-by: TrustMe
8 years agoDoc: Documentation for gesture features. Still a moving target.
David Boddie [Fri, 16 Oct 2009 15:07:48 +0000 (17:07 +0200)]
Doc: Documentation for gesture features. Still a moving target.

Reviewed-by: Trust Me
8 years agoDoc: Moving the Image Gestures example.
David Boddie [Tue, 13 Oct 2009 17:26:35 +0000 (19:26 +0200)]
Doc: Moving the Image Gestures example.

Reviewed-by: Trust Me
8 years agoDoc: Gesture API documentation review and improvements.
David Boddie [Tue, 13 Oct 2009 17:20:40 +0000 (19:20 +0200)]
Doc: Gesture API documentation review and improvements.

Reviewed-by: Trust Me
8 years agoRefactored SymbianSubdirsMetaMakefileGenerator out of qmake.
Miikka Heikkinen [Fri, 16 Oct 2009 12:49:18 +0000 (15:49 +0300)]
Refactored SymbianSubdirsMetaMakefileGenerator out of qmake.

There was no need to have SymbianSubdirsMetaMakefileGenerator in
cross-platform metamakefile.cpp, so moved the Symbian specific
functionality to symmake.cpp as suggested by qmake reviewers.

Task-number: QT-822
Reviewed-by: Janne Anttila
8 years agoFixed a crash in tst_qpainter on SPARC w/gcc.
Trond Kjernåsen [Fri, 16 Oct 2009 14:29:11 +0000 (16:29 +0200)]
Fixed a crash in tst_qpainter on SPARC w/gcc.

This test works with the native Sun compiler for some reason, and
the problem is an unaligned read of 16 bits, which is a problem
on several other architectures.

Reviewed-by: Kim
8 years agoFix tst_QMenu on Symbian.
Liang QI [Fri, 16 Oct 2009 14:20:31 +0000 (16:20 +0200)]
Fix tst_QMenu on Symbian.

For tst_QMenu::activeSubMenuPosition, QS60Style::pixelMetric(QStyle::PM_SubMenuOverlap) is different with other styles.
For tst_QMenu::menuSizeHint, Softkey actions are not widgets and have no geometry.
For tst_QMenu::task258920_mouseBorder, QS60Style::styleHint(QStyle::SH_Menu_MouseTracking) is false.

RevBy: Shane Kearns
RevBy: axis

8 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Sami Merilä [Fri, 16 Oct 2009 12:49:20 +0000 (15:49 +0300)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

8 years agoSoftkeys remain disabled if action owning action widget is enabled
Sami Merilä [Fri, 16 Oct 2009 12:45:18 +0000 (15:45 +0300)]
Softkeys remain disabled if action owning action widget is enabled

Softkeys have a QAction that is related to some action widget.
The initial state of the action was set according the state of action
widget (enabled/disabled). Now, if action widget's state changes,
the softkey's action remain in the initial state.

This was fixed by removing the enable/disable from the QAction and
instead use the real state of action widget when handling the
command of softkey.

Task-number: QTBUG-4619
Reviewed-by: Janne Anttila
8 years agodoc: Changed Trolltech to Nokia
Martin Smith [Fri, 16 Oct 2009 12:30:39 +0000 (14:30 +0200)]
doc: Changed Trolltech to Nokia

8 years agodoc: Corrected typo.
Martin Smith [Fri, 16 Oct 2009 11:41:22 +0000 (13:41 +0200)]
doc: Corrected typo.

8 years agoFixed a crash in the tst_qgl test.
Trond Kjernåsen [Fri, 16 Oct 2009 11:04:13 +0000 (13:04 +0200)]
Fixed a crash in the tst_qgl test.

QGLFramebuffer::isBound() would crash if it was called when there
wasn't a current context bound.

Reviewed-by: Kim
8 years agobuild: Removed alternative definition for ADP_DOCS_QDOCCONF_FILE
Martin Smith [Fri, 16 Oct 2009 10:58:04 +0000 (12:58 +0200)]
build: Removed alternative definition for ADP_DOCS_QDOCCONF_FILE

It used a qdocconf file that no longer exists; something for xcode.

8 years agoMerge branch 'fixes' of git://gitorious.org/~fleury/qt/fleury-openbossa-clone into 4.6
Jan-Arve Sæther [Fri, 16 Oct 2009 10:51:26 +0000 (12:51 +0200)]
Merge branch 'fixes' of git://gitorious.org/~fleury/qt/fleury-openbossa-clone into 4.6

Conflicts:
src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
src/gui/graphicsview/qgraphicsanchorlayout_p.h
tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp

8 years agoRemoved unnecessary include from a public header file.
axis [Fri, 16 Oct 2009 09:55:10 +0000 (11:55 +0200)]
Removed unnecessary include from a public header file.

Task:     QT-2265
RevBy:    Janne Anttila

Compiles on all three Symbian compilers. Strictly speaking GCCE
wasn't able to link QtGui, but that seemed to be unrelated to this
change.

8 years agoFixed `-debug' option to cetest deploying release DLLs.
Rohan McGovern [Fri, 16 Oct 2009 09:56:09 +0000 (11:56 +0200)]
Fixed `-debug' option to cetest deploying release DLLs.

cetest was processing .pro files without build_pass set.
That's wrong, as it means the qmake logic is set up for generating
the debug-and-release glue project instead of the real project.

Until commit 75b41faff44a1488d88eca6e910d4b617cb42221, it didn't
matter. After that commit, cetest would always try to deploy
release versions of Qt DLLs even when run with `-debug'.

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

Task-number: Salesforce 00062670
Reviewed-by: Thiago
8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6
Jan-Arve Sæther [Fri, 16 Oct 2009 10:00:20 +0000 (12:00 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6

8 years agoMake sure that the anchor layout autotests pass in release configuration
Jan-Arve Sæther [Fri, 16 Oct 2009 09:56:08 +0000 (11:56 +0200)]
Make sure that the anchor layout autotests pass in release configuration

The problem was that lastCalculationUsedSimplex was only compiled in
debug mode. The autotests run in release, so it did not compile.

Reviewed-by: alexis
8 years agodoc: Fixed the wording in some \brief commands.
Martin Smith [Fri, 16 Oct 2009 08:47:58 +0000 (10:47 +0200)]
doc: Fixed the wording in some \brief commands.

8 years agoNetworking documentation: Small improvement
Markus Goetz [Fri, 16 Oct 2009 08:46:11 +0000 (10:46 +0200)]
Networking documentation: Small improvement

Task-number: 262144
Reviewed-by: TrustMe
8 years agoFixed uitools.prf to include QtUiTools.lib statically in Symbian
Miikka Heikkinen [Fri, 16 Oct 2009 08:28:14 +0000 (11:28 +0300)]
Fixed uitools.prf to include QtUiTools.lib statically in Symbian

Using just -lQtUiTools instead of -lQtUiTools.lib will make qmake
attempt to autodetect whether or not the lib is static or dynamic,
which will not work since QtUiTools is not necessarily yet built.

Task-number: QT-1018
Reviewed-by: Janne Koskinen
8 years agoCorrected QT_BUILD_PARTS handling for Symbian in projects.pro.
Miikka Heikkinen [Fri, 16 Oct 2009 07:10:03 +0000 (10:10 +0300)]
Corrected QT_BUILD_PARTS handling for Symbian in projects.pro.

Changed QT_BUILD_PARTS to be set in projects.pro only when it's empty
also in Symbian, since configure now correctly sets it in .qmake.cache.

Task-number: QT-1018
Reviewed-by: Janne Koskinen
8 years agoMerge commit 'origin/4.6' into mmfphonon
Frans Englich [Fri, 16 Oct 2009 08:11:14 +0000 (10:11 +0200)]
Merge commit 'origin/4.6' into mmfphonon

8 years agoFixed typo in qtableview.cpp.
Gabriel de Dietrich [Fri, 16 Oct 2009 07:34:38 +0000 (09:34 +0200)]
Fixed typo in qtableview.cpp.

Auto-test included. Will timeout on fail.

Reviewed-by: Alexis
8 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Rhys Weatherley [Fri, 16 Oct 2009 06:53:33 +0000 (16:53 +1000)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

8 years agoMake screen rotation work properly with the PowerVR screen driver
Rhys Weatherley [Fri, 16 Oct 2009 06:45:55 +0000 (16:45 +1000)]
Make screen rotation work properly with the PowerVR screen driver

Task-number: QT-2261
Reviewed-by: Tom
8 years agoMerge commit 'v4.6.0-beta1' into 4.6
Thiago Macieira [Fri, 16 Oct 2009 04:58:10 +0000 (06:58 +0200)]
Merge commit 'v4.6.0-beta1' into 4.6

8 years agoRecognize transformed screens when looking for a QGLScreen
Rhys Weatherley [Fri, 16 Oct 2009 04:48:59 +0000 (14:48 +1000)]
Recognize transformed screens when looking for a QGLScreen

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

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

8 years agoRecognize transformed screens when looking for a QGLScreen
Rhys Weatherley [Fri, 16 Oct 2009 04:48:59 +0000 (14:48 +1000)]
Recognize transformed screens when looking for a QGLScreen

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

Task-number: QT-2261
Reviewed-by: Sarah Smith
8 years agoqdoc: OpenVG supports the blur filter too
Rhys Weatherley [Fri, 16 Oct 2009 02:36:19 +0000 (12:36 +1000)]
qdoc: OpenVG supports the blur filter too

8 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Rhys Weatherley [Fri, 16 Oct 2009 02:23:19 +0000 (12:23 +1000)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

8 years agoImplement the strength parameter for OpenVG colorize filters
Rhys Weatherley [Fri, 16 Oct 2009 02:22:10 +0000 (12:22 +1000)]
Implement the strength parameter for OpenVG colorize filters

Task-number: QT-2016
Reviewed-by: trustme
8 years agoMove audio and video examples into the common multimedia directory.
Andrew den Exter [Thu, 15 Oct 2009 04:40:33 +0000 (14:40 +1000)]
Move audio and video examples into the common multimedia directory.

Brings the video examples into multimedia directory, and removes the
audio sub-directory so the directory structure is in line with the other
example categories.

Task-number: QT-667
Reviewed-by: Kurt Korbatits
8 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Rhys Weatherley [Thu, 15 Oct 2009 23:06:01 +0000 (09:06 +1000)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

8 years agoAllow setting DFBDisplayLayer background color
Anders Bakken [Thu, 15 Oct 2009 22:27:14 +0000 (15:27 -0700)]
Allow setting DFBDisplayLayer background color

We already have an option for setting the background color of the
primary surface when running with NO_WM. Reuse the same option for
allowing users to set the background color of the primary layer.

Also fix the regexp.

Reviewed-by: Donald Carr <donald.carr@nokia.com>
8 years agoRemove unnecessary QWSGLPaintDevice now that we have QGLPaintDevice
Rhys Weatherley [Thu, 15 Oct 2009 22:45:46 +0000 (08:45 +1000)]
Remove unnecessary QWSGLPaintDevice now that we have QGLPaintDevice

Reviewed-by: Tom
8 years agoDon't trust layer when using window_as_cursor
Anders Bakken [Thu, 15 Oct 2009 22:03:16 +0000 (15:03 -0700)]
Don't trust layer when using window_as_cursor

When using QT_DIRECTFB_WINDOW_AS_CURSOR it's likely that the layer
doesn't properly support the mouse. Seeing as one might still very well
have layer support for windows I can't tie the event parsing solely to
NO_DIRECTFB_LAYER.

Reviewed-by: Donald Carr <donald.carr@nokia.com>
8 years agoQGraphicsAnchorLayout: Adding two benchmarks on LinearLayout vs AnchorLayout cases
Jesus Sanchez-Palencia [Wed, 14 Oct 2009 19:56:54 +0000 (16:56 -0300)]
QGraphicsAnchorLayout: Adding two benchmarks on LinearLayout vs AnchorLayout cases

Signed-off-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
8 years agoQGAL: Add anchor layout vs nested linear layouts benchmark
Eduardo M. Fleury [Thu, 15 Oct 2009 18:25:03 +0000 (15:25 -0300)]
QGAL: Add anchor layout vs nested linear layouts benchmark

Adding a benchmark to compare the use of three nested linear layouts
versus the use of a single anchor layout.

We also test two different anchor layout setups to achieve the
same visual result. In the first one we use the addCornerAnchors API
that, in the way it was used, adds reduntant anchors. The second uses
the basic addAnchor API to create only the essential anchors.

Currently the first setup is way slower than the second. That happens
because the redundant anchors create "zero-sized knots" in the graph,
that are not eaten by the simplification algorithm, thus requiring
the usage of the simplex solver.

Zero-sized knots are groups of three or more vertices that are linked
together by zero-sized anchors. In pratice, these vertices represent
the same place in the graph (remember, the distance between them is
zero), but to the simplification mechanism, they look like three
distinct ones.

Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
8 years agoQGraphicsAnchorLayout: Mark expected failures in tests w/o simplification
Eduardo M. Fleury [Thu, 15 Oct 2009 14:16:32 +0000 (11:16 -0300)]
QGraphicsAnchorLayout: Mark expected failures in tests w/o simplification

Some tests are expected to fail when run without simplification, ie. by
setting the environment var QT_ANCHORLAYOUT_NO_SIMPLIFICATION.

This commit adds QEXPECT_FAIL before those tests. In some cases
the failures are random therefore we must disable the test instead.

Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
8 years agoFixed a rare crash in qt_x11_enforce_cursor
Gabriel de Dietrich [Thu, 15 Oct 2009 16:45:13 +0000 (18:45 +0200)]
Fixed a rare crash in qt_x11_enforce_cursor

A QPointer was set to point to a QWidget by one of its children, during its
deletion. This happens during the child deletion, and after the call to
QObject::clearGuards(), which means that the QPointer becomes a dangling one.

The fix ensures that qt_x11_enforce_cursor will not be called with a
being-deleted QWidget. The included auto-test doesn't test anything, except
that it doesn't crash.

Reviewed-by: Olivier
8 years agoUse the fallback icon theme name, if the system icon theme name can not be determined.
Robert Griebl [Thu, 15 Oct 2009 16:37:13 +0000 (18:37 +0200)]
Use the fallback icon theme name, if the system icon theme name can not be determined.

This restores the behavior from before the the gui plugin merge.

Reviewed-by: Olivier Goffart