Commit Graph

1385 Commits

Author SHA1 Message Date
Jørgen Lind
18a3f6169b Merge remote-tracking branch 'base/master' into refactor
Conflicts:
	demos/demos.pro
	demos/embedded/digiflip/digiflip.pro
	examples/examples.pro
	examples/graphicsview/embeddeddialogs/embeddeddialogs.pro
	src/gui/kernel/qplatformglcontext_qpa.cpp
	src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp
	src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp
	src/plugins/platforms/wayland/qwaylanddisplay.cpp
	src/plugins/platforms/wayland/qwaylandwindow.cpp

Change-Id: I2a4ec9e2ca9c9aa9d57b55f98985e810b77bb745
2011-06-27 12:27:54 +02:00
Martin Zielinski
8fb4beb2a1 Removed damaging of waylandsurface after creation
The damaging of the surface at this time causes graphical corruption
in the compositor, as the surface does not contain any rendered output yet.

Change-Id: I51392a68a7531db9901137b9861cb0291e16ff12
Reviewed-on: http://codereview.qt.nokia.com/743
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Matthias Ettrich
Reviewed-by: Lasse Holmstedt
2011-06-27 12:22:24 +02:00
Jiang Jiang
bb6be57b38 Only compare styleNames if they are not empty
Task-number: QTBUG-19366
(cherry picked from commit 15e6ac8f4d9e7a419cd0c10405954bde78559fac)

Change-Id: I5f06bb5133f23dbc8ad6d745d44ca0a85ef49686
Reviewed-on: http://codereview.qt.nokia.com/760
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
2011-06-27 12:22:24 +02:00
aavit
f1c49cd12d Fix problem with cosmetic stroking of cubic beziers
The new algorithm would fail if the start and end point were identical.
(cherry picked from commit 43ce5bab32e0d28366317be99df5e6df70787826)

Change-Id: I44c42b190db95b831fd04492e4afe3555fb3db50
Reviewed-on: http://codereview.qt.nokia.com/610
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2011-06-27 10:59:28 +02:00
aavit
83747a8237 Fix autotest to not depend on rasterization details
This test broke with 37c329a.
(cherry picked from commit 4f46153bce807a5c178a60ce89c38fdd30d13f49)

Change-Id: I29d1ddd67827492cc916330199cc4c708ae676c1
Reviewed-on: http://codereview.qt.nokia.com/609
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2011-06-27 10:59:28 +02:00
aavit
bc7f43cd02 Still use midpoint rendering of aliased ellipses
37c329a removed this, but it is required to get correct fills,
particularly for small radii

Reviewed-by: gunnar
(cherry picked from commit 9d0104d3da01e262d2178c864b4ba94f620eaa3b)

Change-Id: I41a5093f3cf725aee3abffde4d871566f0f8151e
Reviewed-on: http://codereview.qt.nokia.com/608
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2011-06-27 10:59:28 +02:00
Lars Knoll
ad0ecae41c Fix smaller bugs in the stroker
Calculating the continuation point for
closed contours was not taking transformations
and the half pixel offset into account.
(cherry picked from commit 31e9c098f3c9321eebf1ac3e4c44a2d18d3816b8)

Change-Id: I735d8e58fc3cf64668f546d5f42892d420d58e84
Reviewed-on: http://codereview.qt.nokia.com/607
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2011-06-27 10:59:28 +02:00
aavit
048d840ca2 Compilation fix of f8e8583
(cherry picked from commit 7cfd06ee22a875d7658ce6668b418e6f8c6f6480)

Change-Id: Iaaed01590874fbcc439f06c17a63f0343d49a9bb
Reviewed-on: http://codereview.qt.nokia.com/605
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2011-06-27 10:59:28 +02:00
aavit
ecc7c7aeb5 Revert "fix breakages in qpainter autotests."
This reverts commit 50a53d2f7a7e12cd597dc72a08ad62b79fee4554.
...which was required because of
69fc9e594e6d5da87bff42707973683f84b67c93
"Fix how subpixel positions are intepreted in an aliased grid."
which was reverted in f8e85838c5531b56c2175cbdb9c24db426f7fd89
because of 37c329a3e35fabc88fbcad824a69f37c671d2132
"New algorithm for drawing thin lines".

phew!
(cherry picked from commit 14bf7c3761efe208ce19047b8ddc3f811a63a437)

Change-Id: I16d672685efb1901927190c58ef1477c89d946c1
Reviewed-on: http://codereview.qt.nokia.com/604
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2011-06-27 10:59:28 +02:00
aavit
d690b14106 Revert "Fix how subpixel positions are intepreted in an aliased grid."
This reverts commit 69fc9e594e6d5da87bff42707973683f84b67c93.

Conflicts:

	src/gui/painting/qpaintengine_raster.cpp
	src/gui/painting/qrasterizer.cpp
(cherry picked from commit f8e85838c5531b56c2175cbdb9c24db426f7fd89)

Change-Id: I4f936404000e6fa88887d0fbe3fbde92c8edd259
Reviewed-on: http://codereview.qt.nokia.com/603
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2011-06-27 10:59:28 +02:00
Olivier Goffart
7eeabcf70d Fix event delevery order
Some functions (such as QObject::moveToThread) did not keep
the event ordered by priority.
And because qUpperBound is used to add events, that mean new
events would not be inserted in order.

Task-number: QTBUG19637
Change-Id: I38eb9addb1cdd45b8566e000361ac6e5f1f2c2b8
Reviewed-on: http://codereview.qt.nokia.com/733
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
2011-06-27 10:59:28 +02:00
Casper van Donderen
89459bc7cf Add the painting demos-examples to build.
Change-Id: Ia6f23719af0ec3091573909b5666ec795ee22410
Reviewed-on: http://codereview.qt.nokia.com/685
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
2011-06-27 10:59:28 +02:00
Casper van Donderen
d15d0b125b Add the shared painting and affine example to the build.
Change-Id: I85e66c9a33a1c908b7588beb219cc9540698ab68
Reviewed-on: http://codereview.qt.nokia.com/623
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
2011-06-27 10:59:28 +02:00
Jiang Jiang
1fda23c0c6 Store styleName in font database
So that queries like QFontDatabase::styles() can return exactly
the same styles as the system does. Then application can use
QFont::setStyleName() to select those styles later. With a lot
of fonts not providing correct numeric weight/width values and
even if they did, values are usually not directly mapped to
QFont enums, styleName is probably the only reliable way to
select any possible font in the system.

Reviewed-by: QTBUG-13518
Change-Id: Id8a9469b804f1b5bb81d8c7378e7e8778f9a4fff
Reviewed-on: http://codereview.qt.nokia.com/739
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
2011-06-27 10:59:28 +02:00
Lars Knoll
371d398f70 Renamed QLine/TextControl to QWidgetLine/TextControl
Renamed them to free up the QTextControl and QLineControl
class names for a new API in QtGui.

Reviewed-by: Jørgen Lind
2011-06-27 10:16:09 +02:00
Jiang Jiang
a06c8405d0 Add styleName to QFontDef comparison
To make sure we cache different font engines with different style
names.

Task-number: QTBUG-19366
Change-Id: Iefaebd5418f212ff759e03c1745f839a7f23d013
Reviewed-on: http://codereview.qt.nokia.com/738
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
2011-06-27 09:41:24 +02:00
Peter Hartmann
3ff0f5f06d my changelog for 4.8.0
(cherry picked from commit 9d5b0e31f287ce502eaf9a2c0876d900424c80ab)

Change-Id: If3d87498b7df94285d16982df55de9f318a26af2
Reviewed-on: http://codereview.qt.nokia.com/711
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
2011-06-24 16:47:24 +02:00
Casper van Donderen
ebfbac6145 Add the embedded demos-examples to the build.
Change-Id: Ib0a1e650913416e3ec05f1a86c139844a814f8bf
Reviewed-on: http://codereview.qt.nokia.com/686
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Boddie
2011-06-24 16:47:24 +02:00
Casper van Donderen
64cb29a252 Add the graphicsview demo-examples to the build.
Change-Id: I2f97985db9e547c37db00c32b2e1a1658f076f75
Reviewed-on: http://codereview.qt.nokia.com/684
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Boddie
2011-06-24 16:47:24 +02:00
Casper van Donderen
21aba79915 Update sql and animation demos to be an example.
Change-Id: I683383e2dab9428ea3fe4cfffba24bb7fefbc7c7
Reviewed-on: http://codereview.qt.nokia.com/618
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Boddie
2011-06-24 16:47:24 +02:00
Casper van Donderen
e0d5221957 Move all other demos in qtbase to examples.
Change-Id: Iab0e7364d1f6b348d0e3033ea9304139f5bd6d0d
Reviewed-on: http://codereview.qt.nokia.com/617
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Boddie
2011-06-24 16:47:24 +02:00
Casper van Donderen
d7c37d9bac Move the affine example.
Change-Id: I27a164495e469cb2a5c82688f35062b54be5e62f
Reviewed-on: http://codereview.qt.nokia.com/598
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Boddie
2011-06-24 14:53:28 +02:00
Friedemann Kleint
48b1322df3 Compile fix: MinGW. 2011-06-24 14:38:04 +02:00
Laszlo Agocs
73746a5a89 Have the selection offer global handled always without delay.
In a previous attempt to solve the problem of selection offer
globals arriving too early, the handling was delayed. This
solved the issue of crashing but introduced a timing issue,
because the offers (the mime types) will arrive immediately
after the global and therefore will simply be ignored in
case the delayed processing of the selection offer had not
yet been done. The visibility of the problem depended on the
implementation of the compositor, with recent changes to
qt-compositor the issue is very visible.

The patch solves the issue properly: The wayland clipboard
instance is created right away, as early when needed, and the
integration will simply pick up the already created instance.

Change-Id: I75aaba4b0590c05cc0091bed7bb3593186c1188f
Reviewed-on: http://codereview.qt.nokia.com/687
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
2011-06-24 12:09:44 +02:00
Thiago Macieira
ea933359b7 Add a function that returns the D-Bus local machine ID
Cherry-picked from 4.8 59bd3bcd961fb3198dc9ba24996f7f9af67aeda3

Change-Id: Id3c8f9edbcbe9bbea83d4d54a6eb25500ab80b68
Reviewed-on: http://codereview.qt.nokia.com/655
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2011-06-23 18:26:28 +02:00
Jørgen Lind
1b9c679eb5 Make sure to call damage on the buffer when we damage it
Change-Id: Id325a1dee322c2b37215e6577870068260f5f7cc
Reviewed-on: http://codereview.qt.nokia.com/683
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
2011-06-23 17:04:21 +02:00
Jørgen Lind
e9d3699123 Update the wayland plugin
to sha1 bfea3d6befdb688d5354e6f15a9400ea637febf9

Change-Id: Ie855cfbc6b786f1e738e205d403478614774ad34
Reviewed-on: http://codereview.qt.nokia.com/682
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
2011-06-23 17:03:51 +02:00
Samuel Rødal
8ab2f3d9bd Get declarative and wayland EGL backend working for Qt compositor. 2011-06-23 15:40:42 +02:00
Friedemann Kleint
90ac74c771 Pass process event flags to QEventDispatcherWin32.
to enable it to use QWindowSystemInterface::sendWindowsEvents.
2011-06-23 14:48:44 +02:00
Jørgen Lind
ce4d3435d7 Make sure to call damage on the buffer when we damage it 2011-06-23 14:30:22 +02:00
Casper van Donderen
1fab62b930 Remove all references to demos.
Remove the references to demos from configure and qtbase.pro.
This is done because of the merge of the demos and examples in Qt.
Everything will be added as an example.

Change-Id: Iec040f5c719384c7aabba971316de40195ed3a69
Reviewed-on: http://codereview.qt.nokia.com/619
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-06-23 14:03:31 +02:00
Jørgen Lind
bbcc62efaa Update the wayland plugin
to sha1 bfea3d6befdb688d5354e6f15a9400ea637febf9
2011-06-23 13:59:44 +02:00
Morten Johan Sorvig
2f476d8465 Compile. 2011-06-23 11:15:13 +02:00
Morten Sorvig
454a4ebb67 Remove QEventDispatcherQPA inheritance support.
QEventDispatcherQPA is now a small "leaf" class,
there is no need to inherit from it or make it
inherit another event dispatcher.
2011-06-23 11:04:21 +02:00
Morten Sorvig
9988b12cc5 Add QWindowSystemInterface::windowSystemEventsQueued()
This removes the last use of QWindowSystemInterfacePrivate
from outside QtGui, so we can make that class non-exported
again.
2011-06-23 11:04:21 +02:00
Morten Sorvig
58d10c0bd7 Refactor window system event dispatching.
Add QWindowSystemInterface::sendWindowSystemEvents,
which contains the canonical "empty and send queued
window system events" implementation.

Make the Cocoa, QPA, and GLIB dispatchers use the
new implementation. Cocoa now no longer inherits
from QPA.
2011-06-23 11:04:21 +02:00
Morten Sorvig
c359cf0017 Remove stray file. 2011-06-23 11:04:20 +02:00
Friedemann Kleint
4890211f03 Remove leftover file.
Code went into Windows plugin.
2011-06-23 10:27:26 +02:00
Samuel Rødal
6d6ac714ca Prevent endless loop when calling QWaylandShmWindow::format(). 2011-06-22 16:28:45 +02:00
Samuel Rødal
f3440ddf52 Get wayland plugin working again. 2011-06-22 16:26:02 +02:00
Morten Sorvig
9512c440b5 Compile. 2011-06-22 14:58:41 +02:00
Friedemann Kleint
a009fec107 Remove Windows code from platform lib.
Rubber-stamped-by: Jørgen <jorgen.lind@nokia.com>
2011-06-22 14:20:16 +02:00
Morten Sorvig
ca494ce782 Send expose on (initial) show 2011-06-22 14:14:15 +02:00
Morten Sorvig
d6dc5ed1d6 Compile 2011-06-22 14:13:52 +02:00
Morten Sorvig
def5901955 Reintroduce QWindow::SurfaceType
On Cocoa it makes sense to distinguish between the
two window types.

Reviewed-by: Samuel
2011-06-22 14:10:26 +02:00
Richard Moe Gustavsen
0e4844aa24 Cocoa: clean up pro file for platform plugin 2011-06-22 14:01:02 +02:00
Richard Moe Gustavsen
041b809a62 Cocoa: implement support for wheel events 2011-06-22 13:59:35 +02:00
Friedemann Kleint
111068f383 Add QGuiEventDispatcherWin32.
Dispatches Gui events after
DispatchMessage().

Reviewed-by: Samuel Rødal <sroedal@trolltech.com>
Reviewed-by: Morten Sørvig <morten.sorvig@nokia.com>
2011-06-22 13:43:47 +02:00
Friedemann Kleint
8c42defe67 Compile. 2011-06-22 12:11:55 +02:00
Morten Sorvig
be4221d8fa Q_GUI_EXPORT is a mac-only workaround. 2011-06-22 12:04:03 +02:00