AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,132 Commits 4 Branches 0 Tags 339 MiB
ce01064f83
Commit Graph

1132 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Friedemann Kleint
ce01064f83 Fix crash if IBus is not configured. 
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
 2011-06-29 12:01:41 +02:00
Friedemann Kleint
3ffe4283b6 Adapt font engines for Windows/QPA. 
Export QFontEngineMulti and glyph_metrics_t.
Implement alphaMapForGlyph() for the multifont-engines
which is called in the QPA code paths (similar to
boundingBox()).

Acked-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
 2011-06-29 11:19:17 +02:00
Morten Sorvig
57e0c157df Cocoa: Fix RGB/BGR color inversion. 2011-06-29 10:05:16 +02:00
Morten Sorvig
6190290ff1 Compile on Mac. 
Mac is a Unix but we probably don't want to use ibus.
 2011-06-28 12:22:59 +02:00
Morten Sorvig
b5b405ae72 Set mac wayland config. 2011-06-28 12:14:13 +02:00
Morten Sorvig
bebda38eaf Add wayland mac readback implementation. 2011-06-28 12:14:13 +02:00
Morten Sorvig
0058f00b64 Factor out CGL code for reuse in wayland. 2011-06-28 12:14:12 +02:00
Morten Sorvig
8e8ad987a2 Remove load(eventdispatchers). 2011-06-28 12:14:12 +02:00
Lars Knoll
80eb461360 ibus IM support for the xcb backend 
Test code to check input methods using the ibus backend
used on e.g. ubuntu. The IM code is not very sophisticated,
but enough to test that things are working.

Reviewed-by: Jørgen Lind
 2011-06-27 14:31:15 +02:00
Lars Knoll
0584424d5c Fix compilation 
Fix compilation in the autotests due to the renaming
of QTextControl to QWidgetTextControl.

Change-Id: I4820be826f1305540d4d83335b20b66a1c839fb2
 2011-06-27 14:21:13 +02:00
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
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
Lars Knoll
61d22c932d fix autotest regressions introduced by 37c329a3 
Add proper license headers and properly clip
pixel drawing to the devices bounding rect.
(cherry picked from commit 67d275542464c794ec4b650f10cca9a17e10c977)

Change-Id: I52a166919e87e07168fa5f597b22398a1abefe14
Reviewed-on: http://codereview.qt.nokia.com/590
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
 2011-06-22 11:45:29 +02:00
Morten Johan Sorvig
f1975cfc53 Make xcb work again after event dispatcher changes. 
The platform plugin/event dispatcher creation order
has now been reversed and the event dispatcher
cannot be accessed during plugin construciton.
 2011-06-22 11:37:42 +02:00
Oswald Buddenhagen
e6b744fb4b simplify relative path generation 
instead of hand-crafting the logic, simply use QDir::relativeFilePath()

Change-Id: I5a495ad6bdfa8ec126741180770934e7ebee0495
Reviewed-on: http://codereview.qt.nokia.com/512
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
 2011-06-22 11:17:02 +02:00