qt:kde-qt.git
6 years agoMerge remote branches 'kde-qt/patches/0195-compositing-properties', 'kde-qt/patches... 4.7-stable-pached
Thiago Macieira [Tue, 30 Nov 2010 20:13:33 +0000 (21:13 +0100)]
Merge remote branches 'kde-qt/patches/0195-compositing-properties', 'kde-qt/patches/0209-prevent-qt-mixing', 'kde-qt/patches/0216-allow-isystem-for-headers', 'kde-qt/patches/0225-invalidate-tabbar-geometry-on-refresh', 'kde-qt/patches/0250-out_of_source_build', 'kde-qt/patches/0253-qmake_correct_path_separators' and 'kde-qt/README' into 4.7-stable-pached

6 years agoMerge remote branch 'kde-qt/patches/0180-window-role' into 4.7-stable-pached
Thiago Macieira [Tue, 30 Nov 2010 20:13:22 +0000 (21:13 +0100)]
Merge remote branch 'kde-qt/patches/0180-window-role' into 4.7-stable-pached

Conflicts:
src/corelib/kernel/qobject.cpp

6 years agoWhen using qmake outside qt src tree, it sometimes generates wrong patches/0253-qmake_correct_path_separators
Christian Ehrlicher [Thu, 8 May 2008 19:25:49 +0000 (21:25 +0200)]
When using qmake outside qt src tree, it sometimes generates wrong
paths (wrong path separator)

qt-bugs@ issue : none
Trolltech task ID : 214661

6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Wed, 24 Nov 2010 08:50:12 +0000 (09:50 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Fix incorrect example for Qt.rgba()
  Flickable and MouseArea were too eager to take/keep mouse grab.
  Allow javascript date and regexp objects in WorkerScript messages
  Avoid lockup in ListView when animating delegates.
  Fix asynchronous reload call in test, broken by previous submit
  Update QtGui emulator def file for bug QT-3971
  Ignore .pc/
  Ensure WebView press delay timer is cancelled when grab is taken.
  Prevent crash when calling reload() from within a .qml

6 years agoFix incorrect example for Qt.rgba()
Bea Lam [Wed, 24 Nov 2010 05:42:35 +0000 (15:42 +1000)]
Fix incorrect example for Qt.rgba()

6 years agoFlickable and MouseArea were too eager to take/keep mouse grab.
Martin Jones [Wed, 24 Nov 2010 04:28:18 +0000 (14:28 +1000)]
Flickable and MouseArea were too eager to take/keep mouse grab.

This meant that they would sometimes act upon a drag immediately,
rather than waiting for a nested area to take the grab.  This resulted
in a short jump before future events were handled by the nested item.

Task-number: QTBUG-15568
Reviewed-by: Bea Lam
6 years agoAllow javascript date and regexp objects in WorkerScript messages
Bea Lam [Wed, 24 Nov 2010 03:50:27 +0000 (13:50 +1000)]
Allow javascript date and regexp objects in WorkerScript messages

Task-number: QTBUG-14666
Reviewed-by: Aaron Kennedy
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Wed, 24 Nov 2010 03:32:18 +0000 (04:32 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  tst_qthread: fix compilation
  Round origin of text in OpenVG engine
  QThread::exec():  Fix possibility to enter several time the event loop
  QMessageBox: change the documentation to reflect that it is application modal
  Compile on OpenBSD
  Doc: Q_PROPERTY, implements the setter/getter in the example
  Dynamically register the event number.
  Fix wrong error assumption when converting "0.0" to double

6 years agoAvoid lockup in ListView when animating delegates.
Martin Jones [Wed, 24 Nov 2010 01:25:07 +0000 (11:25 +1000)]
Avoid lockup in ListView when animating delegates.

Animating delegates results in the content height changing, which
may result in fixup being called if at the ends of the view, which
may in turn cause refill to be called, which will change the content
height, which repeats.  Prevent this recusion from happening.

Task-number: QTBUG-14821
Reviewed-by: Bea Lam
6 years agoFix asynchronous reload call in test, broken by previous submit
Damian Jansen [Wed, 24 Nov 2010 00:51:29 +0000 (10:51 +1000)]
Fix asynchronous reload call in test, broken by previous submit

Task-number: QTBUG-15493

6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
Qt Continuous Integration System [Wed, 24 Nov 2010 00:09:31 +0000 (01:09 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
  Doc: Fixing typo
  QS60Style: Null pointer crash when using itemviews in some cases (pt2)
  Fix code style
  QS60Style: Null pointer crash when using itemviews in some cases
  Fix the tests that got affected by the behaviour added in 604c51f1fc5c79
  Improve performance of hfw in qgridlayoutengine by adding more caching.
  Tactile Feedback plugin is not compiled in latest Sym^3 RnD envs
  Tactile Feedback plugin is not compiled in latest Sym^3 RnD envs
  QToolbar should fill available width on Symbian
  Adhere to code style
  Some improvements to the docs that was added in merge request 894
  Change the QGraphics*Layout documentation to match the code - that the default alignment is top-left.
  Fix item alignment in layouts bigger than the items thay they contain
  Add autotest to test a issue with stretches and preferred width.
  Code style cleanup for merge request 847
  Add back the tests that were removed by commit fcda1b785bd7d86011f49bfe96cb22b04202933f
  Fix a behaviour change of sizeHint() introduced by 6d4d265e7e67dde58

7 years agoUpdate QtGui emulator def file for bug QT-3971
Joona Petrell [Tue, 23 Nov 2010 10:13:09 +0000 (20:13 +1000)]
Update QtGui emulator def file for bug QT-3971

7 years agoIgnore .pc/
Petri Latvala [Wed, 13 Oct 2010 07:25:14 +0000 (10:25 +0300)]
Ignore .pc/

Reviewed-By: Rohan McGovern
(cherry picked from commit 561a72c2568768f9adf34aa1077717f9311ce56d)

7 years agoEnsure WebView press delay timer is cancelled when grab is taken.
Martin Jones [Tue, 23 Nov 2010 03:44:39 +0000 (13:44 +1000)]
Ensure WebView press delay timer is cancelled when grab is taken.

Flickable steals the grab, but the timer was not stopped and the
keepGrab flag is set and the mouse grabbed. This means that the WebView
now has the grab and subsequent clicks on another element are ignored.

Task-number: QTBUG-15529
Reviewed-by: Joona Petrell
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Damian Jansen [Tue, 23 Nov 2010 02:07:33 +0000 (12:07 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

7 years agoPrevent crash when calling reload() from within a .qml
Damian Jansen [Tue, 23 Nov 2010 02:04:23 +0000 (12:04 +1000)]
Prevent crash when calling reload() from within a .qml

Task-number: QTBUG-15493

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Mon, 22 Nov 2010 23:32:20 +0000 (00:32 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  tst_qthread: fix compilation
  Round origin of text in OpenVG engine
  QThread::exec():  Fix possibility to enter several time the event loop
  QMessageBox: change the documentation to reflect that it is application modal
  Compile on OpenBSD
  Doc: Q_PROPERTY, implements the setter/getter in the example
  Dynamically register the event number.
  Fix wrong error assumption when converting "0.0" to double

7 years agoDoc: Fixing typo
Sergio Ahumada [Mon, 22 Nov 2010 21:49:36 +0000 (22:49 +0100)]
Doc: Fixing typo

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration
Qt Continuous Integration System [Mon, 22 Nov 2010 20:30:15 +0000 (21:30 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/doc-staging:
  Doc: Documented that border width does not affect rectangle geometry.
  Doc: Minor fixes to style.
  Doc: Updated the DirectFB documentation to reflect version changes.
  Doc: correcting heading - Beginning Qt Quick - into - Intro to Qt Quick
  Doc: Correcting references to Qt Declarative module.
  doc: Stated that the destructor does not call close().

7 years agotst_qthread: fix compilation
Olivier Goffart [Mon, 22 Nov 2010 19:37:18 +0000 (20:37 +0100)]
tst_qthread: fix compilation

7 years agoMerge branch '4.7-upstream' into 4.7-water
Thierry Bastian [Mon, 22 Nov 2010 19:38:01 +0000 (20:38 +0100)]
Merge branch '4.7-upstream' into 4.7-water

7 years agoMerge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4...
Qt Continuous Integration System [Mon, 22 Nov 2010 17:01:36 +0000 (18:01 +0100)]
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration

* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
  Fixed handling of QInputMethodEvents with nonzero replacementLength.

7 years agoMerge remote branch 'origin/4.6' into qt-4.7-from-4.6
Thiago Macieira [Mon, 22 Nov 2010 16:15:13 +0000 (17:15 +0100)]
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

No changes.

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Mon, 22 Nov 2010 13:48:20 +0000 (14:48 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Round origin of text in OpenVG engine
  QThread::exec():  Fix possibility to enter several time the event loop
  QMessageBox: change the documentation to reflect that it is application modal
  Compile on OpenBSD
  Doc: Q_PROPERTY, implements the setter/getter in the example
  Dynamically register the event number.
  Fix wrong error assumption when converting "0.0" to double

7 years agoRound origin of text in OpenVG engine
Eskil Abrahamsen Blomfeldt [Mon, 22 Nov 2010 11:07:01 +0000 (12:07 +0100)]
Round origin of text in OpenVG engine

The origin of text needs to be rounded, just like the translation in
the transform because text drawn at subpixel positions is unsupported
on some devices. Since the font is integer-based, the advance-array
does not need to be rounded.

Task-number: QTBUG-15263
Reviewed-by: Jason Barron
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Mon, 22 Nov 2010 11:13:50 +0000 (12:13 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Compile when USER_TIMER_MINIMUM isn't defined
  Docs: QTBUG-10866 Description of how AutoConnection is resolved.
  Fix compilation with Sun Studio 12.1.
  Compile with QT_NO_PROXYSCREEN.
  silence compiler warnings
  Don't let posted events starve native dialogs (regression)

7 years agoCompile when USER_TIMER_MINIMUM isn't defined
Bradley T. Hughes [Mon, 22 Nov 2010 09:52:31 +0000 (10:52 +0100)]
Compile when USER_TIMER_MINIMUM isn't defined

Just user a value of zero instead. Windows will use USER_TIMER_MINIMUM
anyways (according to the SetTimer() docs).

Reviewed-by: trustme
7 years agoQThread::exec(): Fix possibility to enter several time the event loop
Olivier Goffart [Fri, 19 Nov 2010 08:57:18 +0000 (09:57 +0100)]
QThread::exec():  Fix possibility to enter several time the event loop

If one call exit() before calling exec(), this should prevent the
event loop from starting once, but later calls to exec() should work.

This is a regression against Qt 4.6 introduced when fixing QTBUG-1184

Task-number: QTBUG-15378
Reviewed-by: Joao
Reviewed-by: Brad
7 years agoQMessageBox: change the documentation to reflect that it is application modal
Olivier Goffart [Fri, 5 Nov 2010 09:05:47 +0000 (10:05 +0100)]
QMessageBox: change the documentation to reflect that it is application modal

QMessageBox was documented to be window modal, but it is actually
application modal.
Changing the behaviour now would be dangerous, as QMessageBox reenter
the event loop.
So update the documentation.

Task-bumber: QTBUG-14499
Reviewed-by: Joao
Reviewed-by: Denis
7 years agoCompile on OpenBSD
Olivier Goffart [Tue, 9 Nov 2010 10:17:45 +0000 (11:17 +0100)]
Compile on OpenBSD

Fail to compile since f3405a516ac30fc7dee1

Reviewed-by: Joao
7 years agoDoc: Q_PROPERTY, implements the setter/getter in the example
Olivier Goffart [Mon, 8 Nov 2010 20:48:52 +0000 (21:48 +0100)]
Doc: Q_PROPERTY, implements the setter/getter in the example

Some developer thought the implementation of the getters and
setters needed to have some metaobject magic

Also add a NOTIFY signal in the example

Reviewed-by: Joao
7 years agoDynamically register the event number.
Michael Dominic K [Mon, 22 Nov 2010 09:03:00 +0000 (10:03 +0100)]
Dynamically register the event number.

Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Mon, 22 Nov 2010 08:06:21 +0000 (09:06 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Update qml visual tests on mac.
  Doc

7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Mon, 22 Nov 2010 07:06:10 +0000 (08:06 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fixed handling of QInputMethodEvents with nonzero replacementLength.

7 years agoUpdate qml visual tests on mac.
Yann Bodson [Mon, 22 Nov 2010 06:37:47 +0000 (16:37 +1000)]
Update qml visual tests on mac.

Task-number: QTBUG-14792

7 years agoFix wrong error assumption when converting "0.0" to double
Joaquim Rocha [Mon, 15 Nov 2010 12:46:40 +0000 (13:46 +0100)]
Fix wrong error assumption when converting "0.0" to double

The function qstrtod calls strtod without first resetting the errno
but verifying it nonetheless. This could lead to situations where
the errno was already set to ERANGE and hence it would mistakenly
assume the conversion could not be done right.

Merge-request: 2507
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
(cherry picked from commit 759c0b5ecf84201f36d44b4e6c46da1886d85dee)

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Peter Yard [Mon, 22 Nov 2010 04:51:16 +0000 (14:51 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7

7 years agoDocs: QTBUG-10866 Description of how AutoConnection is resolved.
Peter Yard [Mon, 22 Nov 2010 04:48:17 +0000 (14:48 +1000)]
Docs: QTBUG-10866 Description of how AutoConnection is resolved.

7 years agoDoc
Aaron Kennedy [Mon, 22 Nov 2010 00:32:02 +0000 (10:32 +1000)]
Doc

Task-number: QTBUG-15456

7 years agoMerge branch '4.7-upstream' into 4.7-doc
A-Team [Fri, 19 Nov 2010 23:00:14 +0000 (00:00 +0100)]
Merge branch '4.7-upstream' into 4.7-doc

7 years agoMerge branch '4.7-upstream' into 4.7-water
Thierry Bastian [Fri, 19 Nov 2010 23:00:13 +0000 (00:00 +0100)]
Merge branch '4.7-upstream' into 4.7-water

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Fri, 19 Nov 2010 22:58:07 +0000 (23:58 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix compilation with Sun Studio 12.1.
  Compile with QT_NO_PROXYSCREEN.
  silence compiler warnings
  Don't let posted events starve native dialogs (regression)

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
David Boddie [Fri, 19 Nov 2010 19:35:00 +0000 (20:35 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7

7 years agoDoc: Documented that border width does not affect rectangle geometry.
David Boddie [Fri, 19 Nov 2010 19:12:04 +0000 (20:12 +0100)]
Doc: Documented that border width does not affect rectangle geometry.

Task-number: QTBUG-15458

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Fri, 19 Nov 2010 17:57:02 +0000 (18:57 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Doc: Fixing typo.
  Fix possible missing glyphs in raster engine glyph cache
  Fix possible corrupted text when gl glyph cache becomes full
  Check correctly before including SSE4.2 header.
  Fixed crash when destroying QGLWidget
  Prevent crash in GL 2 engine when stroking null rectangle.
  Compile fix.
  Documentation update for new switching events.
  Send QMeeGoSwitchEvent to toplevel widgets before switching graphics system.
  Doc: Fixing typo
  Fix possible missing glyphs in text when using GL engine

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Fri, 19 Nov 2010 17:22:27 +0000 (18:22 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix compilation with Sun Studio 12.1.
  Compile with QT_NO_PROXYSCREEN.
  silence compiler warnings
  Don't let posted events starve native dialogs (regression)

7 years agoDoc: Fixing typo.
Sergio Ahumada [Fri, 19 Nov 2010 15:16:46 +0000 (16:16 +0100)]
Doc: Fixing typo.

7 years agoFixed handling of QInputMethodEvents with nonzero replacementLength.
axis [Fri, 19 Nov 2010 10:15:55 +0000 (11:15 +0100)]
Fixed handling of QInputMethodEvents with nonzero replacementLength.

These types of events replace text that is already in the widget, but
WebKit did not check for replacementLength at all.

RevBy:    Janne Koskinen
Task:     QT-4303
Task:     https://bugs.webkit.org/show_bug.cgi?id=49787
AutoTest: Included

7 years agoFix possible missing glyphs in raster engine glyph cache
Eskil Abrahamsen Blomfeldt [Fri, 19 Nov 2010 13:38:58 +0000 (14:38 +0100)]
Fix possible missing glyphs in raster engine glyph cache

Two possible failures when using the glyph cache on raster engine and
populating the cache with very many glyphs:
1. Change 72f161739b270b01807f97cd853030440f0fd430 caused the maximum
   height of the glyph cache to be 32768, which was not sufficient for
   large fonts with very many characters (e.g. Chinese text)
2. Since we are using QPainter to draw into the glyph cache for RGB32
   glyphcaches, and QPainter does not support very high coordinates,
   we need to create a reference image that references a section of the
   glyph cache and paint into that instead.

Task-number: QT-3971
Reviewed-by: Samuel
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Fri, 19 Nov 2010 13:17:08 +0000 (14:17 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Move qmlvisualaids to another repo
  Initial commit of qmlvisualaids
  Allow testing of raster engine on Mac from qmlviewer
  Don't leak QML compiled data objects
  Add missing symbols to QtOpenGL arm def file
  Add missing symbols to QtOpenGL emulator def file
  Doc: clarify Flickable children vs. contentItem children.
  Add a test on QWS
  Fix parent bug for QDeclarativeOpenMetaObject
  Add missing symbols in QtGui emulator def file

7 years agoFix compilation with Sun Studio 12.1.
Thiago Macieira [Fri, 19 Nov 2010 12:29:04 +0000 (13:29 +0100)]
Fix compilation with Sun Studio 12.1.

Error was:
"tst_qdbusconnection.cpp", line 301: Error: Could not find a match for QTest::qCompare<QTest::T>(QObject*, MyObject*, const char[29], const char[5], const char[24], int) needed in tst_QDBusConnection::registerObject().
"tst_qdbusconnection.cpp", line 498: Error: Could not find a match for QTest::qCompare<QTest::T>(QObject*, TestObject*, const char[39], const char[12], const char[24], int) needed in tst_QDBusConnection::callSelf().

Task-number: QTBUG-15324
Patch-by: Pavel Heimlich
Reviewed-by: Thiago Macieira
7 years agoFix possible corrupted text when gl glyph cache becomes full
Eskil Abrahamsen Blomfeldt [Fri, 19 Nov 2010 11:38:36 +0000 (12:38 +0100)]
Fix possible corrupted text when gl glyph cache becomes full

When the OpenGL glyph cache filled up (the max texture size on the
hardware was exceeded) the characters would be drawn as black blocks
instead. As a work-around for this, the cache will now be cleared and
repopulated whenever this happens, meaning that once in a while (when
a lot of different glyphs have been drawn in a font) there will be a
performance hit. A more complete solution is described in QTBUG-13784,
but this requires so much refactoring that it was deemed too risky for
a patch release. This patch fixes the problem with a small penalty
and low risk.

Task-number: QT-3971
Reviewed-by: Samuel
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7
Sami Merila [Fri, 19 Nov 2010 10:53:26 +0000 (12:53 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7

7 years agoQS60Style: Null pointer crash when using itemviews in some cases (pt2)
Sami Merila [Fri, 19 Nov 2010 10:52:06 +0000 (12:52 +0200)]
QS60Style: Null pointer crash when using itemviews in some cases (pt2)

Also remove accidentally added whitespaces.

Task-number: QTBUG-15455
Reviewed-by: TrustMe
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7
Jan-Arve Sæther [Fri, 19 Nov 2010 10:48:14 +0000 (11:48 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7

7 years agoFix code style
Jan-Arve Sæther [Fri, 19 Nov 2010 10:47:42 +0000 (11:47 +0100)]
Fix code style

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7
Sami Merila [Fri, 19 Nov 2010 10:47:36 +0000 (12:47 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7

7 years agoQS60Style: Null pointer crash when using itemviews in some cases
Sami Merila [Fri, 19 Nov 2010 10:45:46 +0000 (12:45 +0200)]
QS60Style: Null pointer crash when using itemviews in some cases

QS60Style attempts to use null pointer when drawing CE_ItemViewItem,
if the parameter widget is provided as null.

This leads to, for example, Chart example app crash in startup.

Reviewed-by: Janne Anttila
7 years agoMerge branch '4.7' into QTBUG-15333
Jan-Arve Sæther [Fri, 19 Nov 2010 10:36:01 +0000 (11:36 +0100)]
Merge branch '4.7' into QTBUG-15333

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into QTBUG-15333
Jan-Arve Sæther [Fri, 19 Nov 2010 10:33:07 +0000 (11:33 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into QTBUG-15333

7 years agoCompile with QT_NO_PROXYSCREEN.
Sam Magnuson [Fri, 19 Nov 2010 10:24:58 +0000 (11:24 +0100)]
Compile with QT_NO_PROXYSCREEN.

Merge-request: 931
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7
Jan-Arve Sæther [Fri, 19 Nov 2010 10:21:30 +0000 (11:21 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7

7 years agoFix the tests that got affected by the behaviour added in 604c51f1fc5c79
Jan-Arve Sæther [Fri, 19 Nov 2010 10:19:32 +0000 (11:19 +0100)]
Fix the tests that got affected by the behaviour added in 604c51f1fc5c79

Task-number: QTBUG-13551
Task-number: QTBUG-7756

7 years agosilence compiler warnings
Harald Fernengel [Fri, 19 Nov 2010 09:58:09 +0000 (10:58 +0100)]
silence compiler warnings

Silence shadowing warnings from gcc.

7 years agoMove qmlvisualaids to another repo
Alan Alpert [Fri, 19 Nov 2010 09:31:01 +0000 (19:31 +1000)]
Move qmlvisualaids to another repo

Moved to a personal repo, since its fate is a little uncertain so it
shouldn't draw this much attention.

Task-number: QTBUG-14792

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Alan Alpert [Fri, 19 Nov 2010 08:31:04 +0000 (18:31 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

7 years agoInitial commit of qmlvisualaids
Alan Alpert [Fri, 19 Nov 2010 08:29:11 +0000 (18:29 +1000)]
Initial commit of qmlvisualaids

A tool to make it easier to do the platform visual updating. Needs to be
streamlined at least a little in order to make it feasible to stay up to
date.

Task-number: QTBUG-14792

7 years agoImprove performance of hfw in qgridlayoutengine by adding more caching.
Jan-Arve Sæther [Thu, 18 Nov 2010 14:06:45 +0000 (15:06 +0100)]
Improve performance of hfw in qgridlayoutengine by adding more caching.

The previous code tried to do caching of queries with constraints too,
but it's usecase was rather limited.
The caching worked for the simple case of
effectiveSizeHint(Qt::PreferredSize, QSize(10, -1));
effectiveSizeHint(Qt::PreferredSize, QSize(10, -1));    // uses cache

The problem was that if somebody called this sequence:
effectiveSizeHint(Qt::PreferredSize, QSize(10, -1));
effectiveSizeHint(Qt::PreferredSize, QSize(-1, -1));
effectiveSizeHint(Qt::PreferredSize, QSize(10, -1));

Each call would disregard the cache because the constraint was
different.

Now the pattern is used in the qgridlayoutengine itself when we
calculate hfw: (yes, height-for-width).
First, we ask for the horizontal size hints with no constraints.
Then, we'll ask for the vertical size hints with constraints.
Since horizontal and vertical ultimately comes from the same function
(effectiveSizeHint) it will invalidate the cache each time.

The solution is to add another cache for the sizeHints with
constraints.

The most notable improvement is in the hfw, nested case. Result:
RESULT : tst_QGraphicsLinearLayout::heightForWidth():"hfw, nested":
     546 msecs per iteration (total: 546, iterations: 1)

RESULT : tst_QGraphicsLinearLayout::heightForWidth():"hfw, nested":
     0.000029 msecs per iteration (total: 62, iterations: 2097152)

Improvement: 18,827,586 times faster (!!)

7 years agoAllow testing of raster engine on Mac from qmlviewer
Aaron Kennedy [Fri, 19 Nov 2010 06:34:05 +0000 (16:34 +1000)]
Allow testing of raster engine on Mac from qmlviewer

7 years agoDon't leak QML compiled data objects
Aaron Kennedy [Fri, 19 Nov 2010 06:23:52 +0000 (16:23 +1000)]
Don't leak QML compiled data objects

Task-number: QTBUG-14761

7 years agoAdd missing symbols to QtOpenGL arm def file
Joona Petrell [Fri, 19 Nov 2010 04:40:33 +0000 (14:40 +1000)]
Add missing symbols to QtOpenGL arm def file

7 years agoAdd missing symbols to QtOpenGL emulator def file
Joona Petrell [Fri, 19 Nov 2010 03:29:48 +0000 (13:29 +1000)]
Add missing symbols to QtOpenGL emulator def file

7 years agoDoc: clarify Flickable children vs. contentItem children.
Martin Jones [Fri, 19 Nov 2010 00:55:22 +0000 (10:55 +1000)]
Doc: clarify Flickable children vs. contentItem children.

7 years agoAdd a test on QWS
Alan Alpert [Thu, 18 Nov 2010 23:19:41 +0000 (09:19 +1000)]
Add a test on QWS

Without a single test, it fails anyways.

Task-number: QTBUG-14792

7 years agoMerge branch '4.7-upstream' into 4.7-doc
A-Team [Thu, 18 Nov 2010 23:00:13 +0000 (00:00 +0100)]
Merge branch '4.7-upstream' into 4.7-doc

7 years agoMerge branch '4.7-upstream' into 4.7-water
Thierry Bastian [Thu, 18 Nov 2010 23:00:13 +0000 (00:00 +0100)]
Merge branch '4.7-upstream' into 4.7-water

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Thu, 18 Nov 2010 15:53:04 +0000 (16:53 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Check correctly before including SSE4.2 header.
  Fixed crash when destroying QGLWidget
  Prevent crash in GL 2 engine when stroking null rectangle.
  Compile fix.
  Documentation update for new switching events.
  Send QMeeGoSwitchEvent to toplevel widgets before switching graphics system.
  Doc: Fixing typo
  Fix possible missing glyphs in text when using GL engine

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Thu, 18 Nov 2010 14:58:51 +0000 (15:58 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Don't let posted events starve native dialogs (regression)

7 years agoFix parent bug for QDeclarativeOpenMetaObject
Marco Bubke [Thu, 18 Nov 2010 12:35:44 +0000 (13:35 +0100)]
Fix parent bug for QDeclarativeOpenMetaObject

The dynamic meta object was not called because no parent meta object was called.

Reviewed-By: Aaron Kennedy
7 years agoDon't let posted events starve native dialogs (regression)
Bradley T. Hughes [Thu, 18 Nov 2010 11:42:14 +0000 (12:42 +0100)]
Don't let posted events starve native dialogs (regression)

After commit eb1015c7bbf135af3656110a4d112377c1209db8, it is possible
for posted events to starve some of the (most likely internal) messages
used by native dialogs.

This commit reverts eb1015c7bbf135af3656110a4d112377c1209db8, and
instead introduces a Windows timer to keep sendPostedEvents() happening
while the event queue is very active. The GetMessage() hook we install
will eventually see when the queue is empty and we can use PostMessage()
again, which will then stop this timer.

This fixes the regression reported in QTBUG-14655, as well as all of the
other reported regressions and problems since the initial commit
31f1ff91028dd7f90925d5b3737e4d88b5fb07aa (which ensures that posted
events are sent even when Windows is spinning the message loop).

Task-number: QTBUG-14655
Reviewed-by: joao
7 years agoMerge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-water-team into 4.7
Sami Merila [Thu, 18 Nov 2010 11:17:53 +0000 (13:17 +0200)]
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-water-team into 4.7

7 years agoTactile Feedback plugin is not compiled in latest Sym^3 RnD envs
Sami Merila [Thu, 18 Nov 2010 11:06:10 +0000 (13:06 +0200)]
Tactile Feedback plugin is not compiled in latest Sym^3 RnD envs

Due to somewhat questionable .pro-file flagging, the plugin is not
currently compiled at all for latest Sym^3 environments.

Flagging is now more bulletproof (not 3.1 & not 3.2), so even if the
upcoming platform versions change, this should work in the future.

Task-number: QTBUG-15428
Reviewed-by: Miikka Heikkinen
7 years agoAdd missing symbols in QtGui emulator def file
Joona Petrell [Thu, 18 Nov 2010 10:57:20 +0000 (20:57 +1000)]
Add missing symbols in QtGui emulator def file

7 years agoCheck correctly before including SSE4.2 header.
Mike McQuaid [Thu, 18 Nov 2010 05:40:36 +0000 (05:40 +0000)]
Check correctly before including SSE4.2 header.

Previously, this failed machines that only had SSE4.1 but not
SSE4.2 due to an assumption that nmmintrin.h could be included
when only using SSE4.1.

Fixes http://bugreports.qt.nokia.com/browse/QTBUG-13623.

Merge-request: 929
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
7 years agoTactile Feedback plugin is not compiled in latest Sym^3 RnD envs
Sami Merila [Thu, 18 Nov 2010 11:06:10 +0000 (13:06 +0200)]
Tactile Feedback plugin is not compiled in latest Sym^3 RnD envs

Due to somewhat questionable .pro-file flagging, the plugin is not
currently compiled at all for latest Sym^3 environments.

Flagging is now more bulletproof (not 3.1 & not 3.2), so even if the
upcoming platform versions change, this should work in the future.

Task-number: QTBUG-15428
Reviewed-by: Mikka Heikkinen
7 years agoMerge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-water-team into 4.7
Sami Merila [Thu, 18 Nov 2010 10:46:58 +0000 (12:46 +0200)]
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-water-team into 4.7

7 years agoQToolbar should fill available width on Symbian
Sami Merila [Thu, 18 Nov 2010 10:15:03 +0000 (12:15 +0200)]
QToolbar should fill available width on Symbian

Normally QStyle provides a minimum size for a widget. However, to
imitate native toolbar behavior, QToolBar should occupy available
screen estate on Symbian (with QS60Style). This is only supported
for horizontal QToolBars as native side does not have same
functionality for vertical toolbars.

QToolbar size now tries to take into account available size of
parent reduced by margins (if several parents, then each can reduce
the available space by their margins). Also, toolbar internal
pixel metrics data (item spacing, item margins) are taken into
account.

Task-number: QTBUG-13120
Reviewed-by: Janne Koskinen
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 18 Nov 2010 09:58:38 +0000 (10:58 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Fine-tune the tests being run on the CI system.
  Standardize selection color in visual test

7 years agoFine-tune the tests being run on the CI system.
Alan Alpert [Thu, 18 Nov 2010 05:38:32 +0000 (15:38 +1000)]
Fine-tune the tests being run on the CI system.

We don't want to bother running tests on QWS, or text tests on X11 until
they update the ubuntu version.

Task-number: QTBUG-14792

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Thu, 18 Nov 2010 05:32:06 +0000 (06:32 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fixed crash when destroying QGLWidget
  Prevent crash in GL 2 engine when stroking null rectangle.
  Compile fix.
  Documentation update for new switching events.
  Send QMeeGoSwitchEvent to toplevel widgets before switching graphics system.
  Doc: Fixing typo
  Fix possible missing glyphs in text when using GL engine

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Thu, 18 Nov 2010 02:02:18 +0000 (03:02 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Use GLIBC functions on any GLIBC architecture.
  tst_qnetworkreply: Fix ugly test

7 years agoStandardize selection color in visual test
Alan Alpert [Thu, 18 Nov 2010 00:55:41 +0000 (10:55 +1000)]
Standardize selection color in visual test

Task-number: QTBUG-14792

7 years agoMerge branch '4.7-upstream' into 4.7-water
Thierry Bastian [Wed, 17 Nov 2010 23:00:11 +0000 (00:00 +0100)]
Merge branch '4.7-upstream' into 4.7-water

7 years agoMerge branch '4.7-upstream' into 4.7-doc
A-Team [Wed, 17 Nov 2010 23:00:11 +0000 (00:00 +0100)]
Merge branch '4.7-upstream' into 4.7-doc

7 years agoUse GLIBC functions on any GLIBC architecture.
Oswald Buddenhagen [Wed, 17 Nov 2010 18:08:02 +0000 (19:08 +0100)]
Use GLIBC functions on any GLIBC architecture.

Make use of __GLIBC__ instead of Q_OS_LINUX for functions available
globally in GNU libc, not just on Linux.

the !__UCLIBC__ are still needed, as uClibc defines __GLIBC__ for
compatibility with a lot of applications which rely on it.

Task-number: QTBUG-15401

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Wed, 17 Nov 2010 15:11:29 +0000 (16:11 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fixed crash when destroying QGLWidget
  Prevent crash in GL 2 engine when stroking null rectangle.
  Compile fix.
  Documentation update for new switching events.
  Send QMeeGoSwitchEvent to toplevel widgets before switching graphics system.
  Doc: Fixing typo
  Fix possible missing glyphs in text when using GL engine

7 years agoFixed crash when destroying QGLWidget
Thorbjørn Lindeijer [Tue, 16 Nov 2010 12:19:29 +0000 (14:19 +0200)]
Fixed crash when destroying QGLWidget

The QGLWidget destroys the QGLContext, which in turn destroys the
bound pixmap. When this happens there may not be a current QGLContext,
so check that before trying to restore it.

Done-with: Gunnar Sletta
Reviewed-by: Samuel
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
David Boddie [Wed, 17 Nov 2010 12:56:03 +0000 (13:56 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7

7 years agoDoc: Minor fixes to style.
David Boddie [Wed, 17 Nov 2010 12:51:05 +0000 (13:51 +0100)]
Doc: Minor fixes to style.

7 years agoDoc: Updated the DirectFB documentation to reflect version changes.
David Boddie [Wed, 17 Nov 2010 12:50:20 +0000 (13:50 +0100)]
Doc: Updated the DirectFB documentation to reflect version changes.