Morten Sorvig [Thu, 23 Jun 2011 08:44:15 +0000 (10:44 +0200)]
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.
Morten Sorvig [Thu, 23 Jun 2011 08:31:46 +0000 (10:31 +0200)]
Add QWindowSystemInterface::windowSystemEventsQueued()
This removes the last use of QWindowSystemInterfacePrivate
from outside QtGui, so we can make that class non-exported
again.
Morten Sorvig [Thu, 23 Jun 2011 07:05:34 +0000 (09:05 +0200)]
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.
Morten Sorvig [Thu, 23 Jun 2011 07:01:36 +0000 (09:01 +0200)]
Remove stray file.
Friedemann Kleint [Thu, 23 Jun 2011 08:27:26 +0000 (10:27 +0200)]
Remove leftover file.
Code went into Windows plugin.
Samuel Rødal [Wed, 22 Jun 2011 14:28:45 +0000 (16:28 +0200)]
Prevent endless loop when calling QWaylandShmWindow::format().
Samuel Rødal [Wed, 22 Jun 2011 14:26:02 +0000 (16:26 +0200)]
Get wayland plugin working again.
Morten Sorvig [Wed, 22 Jun 2011 12:57:37 +0000 (14:57 +0200)]
Compile.
Friedemann Kleint [Wed, 22 Jun 2011 12:18:18 +0000 (14:18 +0200)]
Remove Windows code from platform lib.
Rubber-stamped-by: Jørgen <jorgen.lind@nokia.com>
Morten Sorvig [Wed, 22 Jun 2011 12:14:15 +0000 (14:14 +0200)]
Send expose on (initial) show
Morten Sorvig [Wed, 22 Jun 2011 12:13:52 +0000 (14:13 +0200)]
Compile
Morten Sorvig [Wed, 22 Jun 2011 11:33:27 +0000 (13:33 +0200)]
Reintroduce QWindow::SurfaceType
On Cocoa it makes sense to distinguish between the
two window types.
Reviewed-by: Samuel
Richard Moe Gustavsen [Wed, 22 Jun 2011 11:59:25 +0000 (13:59 +0200)]
Cocoa: clean up pro file for platform plugin
Richard Moe Gustavsen [Wed, 22 Jun 2011 11:57:35 +0000 (13:57 +0200)]
Cocoa: implement support for wheel events
Friedemann Kleint [Wed, 22 Jun 2011 10:23:59 +0000 (12:23 +0200)]
Add QGuiEventDispatcherWin32.
Dispatches Gui events after
DispatchMessage().
Reviewed-by: Samuel Rødal <sroedal@trolltech.com>
Reviewed-by: Morten Sørvig <morten.sorvig@nokia.com>
Friedemann Kleint [Wed, 22 Jun 2011 10:11:55 +0000 (12:11 +0200)]
Compile.
Morten Sorvig [Wed, 22 Jun 2011 10:04:03 +0000 (12:04 +0200)]
Q_GUI_EXPORT is a mac-only workaround.
Morten Johan Sorvig [Wed, 22 Jun 2011 09:33:17 +0000 (11:33 +0200)]
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.
Lars Knoll [Tue, 21 Jun 2011 14:45:00 +0000 (16:45 +0200)]
add QInputMethodQueryEvent
QInputMethodQueryEvent will replace the old
inputMethodHints() and inputMethodQuery() APIs
in QWidget. It has the advantage that it works
nicely with any kind of QObject.
Lars Knoll [Tue, 21 Jun 2011 14:00:36 +0000 (16:00 +0200)]
remove the plugin support for QInputContext
This will be handled through the lighthouse plugin
instead.
Lars Knoll [Tue, 21 Jun 2011 13:41:09 +0000 (15:41 +0200)]
add a platform interface for input method support
add QPlatformInputContext to help supporting
complex text input. Communication with the
focus objects/widgets will happen slightly
different then before, through events instead of
methods one can query on QWidget.
Morten Johan Sorvig [Wed, 22 Jun 2011 08:07:17 +0000 (10:07 +0200)]
Add libxcb-xfixes0-dev to xcb deps
Samuel Rødal [Wed, 22 Jun 2011 07:50:47 +0000 (09:50 +0200)]
Compile fix (region is an accessor now, not a public member variable).
Morten Sorvig [Tue, 21 Jun 2011 11:40:57 +0000 (13:40 +0200)]
Add lighthouse event dispatcher API.
Platform plugin creation is now moved forward in
order to have a platform plugin instance at event
dispatcher creation time.
Plugins are now responsible for implementing
PlatformIntegration::createEventDispatcher and returning
an QAbstractEventDispatcher subclass.
Samuel Rødal [Tue, 21 Jun 2011 15:00:25 +0000 (17:00 +0200)]
Made QExposeEvent public and added exposeEvent() in QWindow.
This is needed for applications that use QBackingStore directly.
Friedemann Kleint [Tue, 21 Jun 2011 14:20:15 +0000 (16:20 +0200)]
Compile.
Samuel Rødal [Tue, 21 Jun 2011 11:39:26 +0000 (13:39 +0200)]
OpenGL API refactor.
Rename QGuiGLFormat to QSurfaceFormat, and make QWindow sub-class of
QSurface and QPlatformWindow sub-class of QPlatformSurface, instead of
having QPlatformGLSurface accessor in QWindow.
Richard Moe Gustavsen [Tue, 21 Jun 2011 11:53:21 +0000 (13:53 +0200)]
Cocoa: fix compiler warning
Richard Moe Gustavsen [Tue, 21 Jun 2011 09:48:42 +0000 (11:48 +0200)]
Cocoa: add missing return statement
Rev-By: sroedal
Laszlo Agocs [Tue, 21 Jun 2011 08:21:46 +0000 (10:21 +0200)]
Make readback-glx working again in wayland.
Laszlo Agocs [Tue, 21 Jun 2011 08:09:56 +0000 (10:09 +0200)]
Compile fix for readbackglx after surface->backingstore renaming.
Morten Sorvig [Tue, 21 Jun 2011 07:56:46 +0000 (09:56 +0200)]
Compile.
Morten Sorvig [Tue, 21 Jun 2011 07:47:30 +0000 (09:47 +0200)]
Compile fix for platformsupport on Mac.
Switch platformsupport over to be a shared library,
which is well supported by the build system.
This requires exporting classes we use. I've done
this on OS_MAC only for now.
Reverts
4581a9999e12e14bbf0836d0740191ba50109540
Samuel Rødal [Mon, 20 Jun 2011 12:14:34 +0000 (14:14 +0200)]
Port Cocoa plugin to new backing store interface.
Samuel Rødal [Mon, 20 Jun 2011 11:29:26 +0000 (13:29 +0200)]
Rename QWindowSurface -> QBackingStore and split into platform / public.
Also get rid of GL window surface and related classes.
Samuel Rødal [Mon, 20 Jun 2011 10:32:49 +0000 (12:32 +0200)]
Compile fixes.
Richard Moe Gustavsen [Mon, 20 Jun 2011 12:18:01 +0000 (14:18 +0200)]
Mac: buildfix for cocoa lighthouse plugin
Rev-By: msorvig
Richard Moe Gustavsen [Mon, 20 Jun 2011 11:20:49 +0000 (13:20 +0200)]
Mac: buildfix for QtPlatformsupport
Lars Knoll [Mon, 20 Jun 2011 10:10:26 +0000 (12:10 +0200)]
Don't crash if Clipboard and Selection hold the same mimedate
Cliboard and Selection can hold the same QMimeData object.
Don't delete the mimedata in this case before when clearing
only one of them.
Reviewed-by: Samuel
Lars Knoll [Sat, 18 Jun 2011 20:50:30 +0000 (22:50 +0200)]
use selection changed events from XFixes
properly initialize the XFixes extension and then
use the selection changed events to notify
Qt apps.
Reviewed-by: Samuel
Lars Knoll [Fri, 17 Jun 2011 13:37:37 +0000 (15:37 +0200)]
remove postscript related files
We don't support postscript in Qt 5 anymore
Reviewed-by: Gunnar
Lars Knoll [Wed, 8 Jun 2011 20:00:39 +0000 (22:00 +0200)]
Enhance Xcb clipboard code
Some cleanup on the data structures.
Properly implement support for timestamps on each
selection.
Transfer selections to the clipboard manager on
exit if it exists.
Properly clear our selection when X11 asks us to
do so.
Lars Knoll [Wed, 8 Jun 2011 19:59:33 +0000 (21:59 +0200)]
Add a platform API for QClipboard::ownsMode()
Simply forward ownsMode() to the QPlatformClipboard.
Laszlo Agocs [Mon, 20 Jun 2011 10:21:29 +0000 (12:21 +0200)]
Restoring QT_WAYLAND_GL_SUPPORT ifdefs.
Richard Moe Gustavsen [Mon, 20 Jun 2011 09:57:23 +0000 (11:57 +0200)]
Mac: build fix. Make sure Platformsupport builds as a static lib.
...and not as an .app, as It did.
Rev-By: Jørgen Lind
Laszlo Agocs [Thu, 16 Jun 2011 10:56:00 +0000 (12:56 +0200)]
Make glx wayland backends working.
Laszlo Agocs [Fri, 17 Jun 2011 12:39:00 +0000 (14:39 +0200)]
Remove leftover xkb member variable in QXcbKeyboard.
Friedemann Kleint [Tue, 14 Jun 2011 07:52:10 +0000 (09:52 +0200)]
Compile.
Jørgen Lind [Fri, 10 Jun 2011 14:05:03 +0000 (16:05 +0200)]
Autodetect the xcb backend
Samuel Rødal [Fri, 10 Jun 2011 14:04:22 +0000 (16:04 +0200)]
Use XCB_GRAVITY_STATIC in XCB plugin for frame independent geometry.
Jørgen Lind [Fri, 10 Jun 2011 11:35:10 +0000 (13:35 +0200)]
Merge branch 'refactor' of scm.dev.nokia.troll.no:qt/qtbase-staging into refactor
Jørgen Lind [Fri, 10 Jun 2011 11:26:36 +0000 (13:26 +0200)]
Compile fix, and remove warnings
Jørgen Lind [Fri, 10 Jun 2011 08:50:10 +0000 (10:50 +0200)]
Merge remote-tracking branch 'base/master' into refactor
Conflicts:
examples/animation/animatedtiles/animatedtiles.pro
examples/animation/appchooser/appchooser.pro
examples/animation/moveblocks/moveblocks.pro
examples/animation/states/states.pro
examples/animation/stickman/stickman.pro
examples/dialogs/configdialog/configdialog.pro
examples/dialogs/sipdialog/sipdialog.pro
examples/dialogs/standarddialogs/standarddialogs.pro
examples/dialogs/tabdialog/tabdialog.pro
examples/draganddrop/draggableicons/draggableicons.pro
examples/draganddrop/draggabletext/draggabletext.pro
examples/draganddrop/fridgemagnets/fridgemagnets.pro
examples/draganddrop/puzzle/puzzle.pro
examples/gestures/imagegestures/imagegestures.pro
examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro
examples/graphicsview/collidingmice/collidingmice.pro
examples/graphicsview/elasticnodes/elasticnodes.pro
examples/graphicsview/weatheranchorlayout/weatheranchorlayout.pro
examples/itemviews/addressbook/addressbook.pro
examples/itemviews/chart/chart.pro
examples/itemviews/fetchmore/fetchmore.pro
examples/itemviews/puzzle/puzzle.pro
examples/mainwindows/menus/menus.pro
examples/painting/basicdrawing/basicdrawing.pro
examples/painting/concentriccircles/concentriccircles.pro
examples/painting/imagecomposition/imagecomposition.pro
examples/painting/painterpaths/painterpaths.pro
examples/painting/transformations/transformations.pro
examples/qtconcurrent/imagescaling/imagescaling.pro
examples/qtestlib/tutorial1/tutorial1.pro
examples/qtestlib/tutorial2/tutorial2.pro
examples/qtestlib/tutorial3/tutorial3.pro
examples/qtestlib/tutorial4/tutorial4.pro
examples/qtestlib/tutorial5/tutorial5.pro
examples/qws/dbscreen/dbscreen.pro
examples/qws/svgalib/svgalib.pro
examples/richtext/syntaxhighlighter/syntaxhighlighter.pro
examples/statemachine/rogue/rogue.pro
examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro
examples/tools/styleplugin/plugin/plugin.pro
examples/uitools/multipleinheritance/multipleinheritance.pro
examples/widgets/analogclock/analogclock.pro
examples/widgets/calculator/calculator.pro
examples/widgets/calendarwidget/calendarwidget.pro
examples/widgets/codeeditor/codeeditor.pro
examples/widgets/icons/icons.pro
examples/widgets/imageviewer/imageviewer.pro
examples/widgets/lineedits/lineedits.pro
examples/widgets/movie/movie.pro
examples/widgets/shapedclock/shapedclock.pro
examples/widgets/softkeys/softkeys.pro
examples/widgets/tetrix/tetrix.pro
src/gui/painting/qpaintengine_raster.cpp
src/gui/painting/qpaintengine_raster_p.h
src/openvg/openvg.pro
src/openvg/qpaintengine_vg_p.h
src/plugins/graphicssystems/meego/meego.pro
src/plugins/platforms/fontdatabases/basicunix/basicunix.pri
Samuel Rødal [Fri, 10 Jun 2011 10:40:29 +0000 (12:40 +0200)]
Added frameMargins() API and support in XCB plugin.
Friedemann Kleint [Fri, 10 Jun 2011 08:40:52 +0000 (10:40 +0200)]
Compile Windows.
Jørgen Lind [Fri, 10 Jun 2011 08:16:18 +0000 (10:16 +0200)]
Fix QtPlatformSupport when compiling with glx and xcb
Jørgen Lind [Fri, 10 Jun 2011 08:04:35 +0000 (10:04 +0200)]
Fix versionheader name for QtPlatformSupport
Friedemann Kleint [Fri, 10 Jun 2011 08:03:29 +0000 (10:03 +0200)]
idc: Do not link against QtGui.
(which throws off the build order).
Jørgen Lind [Fri, 10 Jun 2011 07:54:12 +0000 (09:54 +0200)]
Remove the platforms/install_rules directory
Jørgen Lind [Fri, 10 Jun 2011 07:37:17 +0000 (09:37 +0200)]
Update dependency list in xcb README
Jørgen Lind [Thu, 9 Jun 2011 13:56:55 +0000 (15:56 +0200)]
QtPlatformSupport: A helper library for platform plugins
QtPlatformSupport is a static library. Platform plugins are meant to
link against this library to pull in dependencies such as fontengines
and convenience functions for finding the right GL configs. The linker
will only pull in the symbols used, so the size of the library doesn't
really matter
Tapani Mikola [Fri, 10 Jun 2011 06:25:54 +0000 (09:25 +0300)]
Fontengine buildfix for xcb platform plugin.
Change-Id: Ic909e1ac08163e62634643c68862e802a016b911
Reviewed-on: http://codereview.qt.nokia.com/442
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Morten Sorvig [Fri, 10 Jun 2011 07:17:36 +0000 (09:17 +0200)]
Actually add QEventDispatcherMac.
Samuel Rødal [Tue, 7 Jun 2011 15:25:22 +0000 (17:25 +0200)]
QWindowContext / QWindowFormat refactor.
To enable having a single GL context used for multiple drawables we need
to de-couple the context class a bit more from the window class in the
plugin API. Now contexts are created stand-alone based on a GL format
and a share context, and when calling makeCurrent() a desired surface
is specified. This maps well to GLX, EGL, Cocoa, AGL, and WGL, which all
support this use case.
QWindowContext is renamed to QGuiGLContext, and QWindowFormat is renamed
to QGuiGLFormat. We have the ability to introduce a pbuffer or similar
other offscreen GL drawable abstraction in the future.
Shane [Wed, 8 Jun 2011 16:10:19 +0000 (17:10 +0100)]
tst_qnetworkreply: Fix divide by zero crash on MacOS X
Change-Id: Ie1b6d5aa25a745eb6c16041151141efe99c051aa
Reviewed-on: http://codereview.qt.nokia.com/422
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
Laszlo Agocs [Thu, 9 Jun 2011 14:47:07 +0000 (16:47 +0200)]
Use XLookupString for translating key events.
There seems to be no easy equivalent in the XCB world and the
fallback we currently have is really incomplete. Hence we will
call XLookupString with a fake XKeyEvent if XCB_USE_XLIB is
enabled.
Reviewed-by: Samuel Rødal
Jiang Jiang [Sat, 4 Jun 2011 12:47:22 +0000 (14:47 +0200)]
Allow selecting fonts with irregular style names
Fonts like "Helvetica Neue UltraLight" or "Skia Regular Black
Condensed" can't be selected in Qt because either they don't
report correct numeric values for weight/stretch/etc. or these
values are not mapped from QFont enums in a linear way. Thus
we provide a shortcut to select these fonts with PostScript
name or full name without resorting to family name matching in
QFontDatabase (these fonts are not registered in font database
anyway). After this, we can simply use:
QFont font("Helvetica Neue");
font.setStyleName("UltraLight");
to select these fonts. QCoreTextFontEngineMulti matched like
this can be created directly from the CTFontRef instance
instead of creating from the font name, making this process
faster.
The commit also cleaned up the font loading process in Mac
font database a bit, moving the code for family matching into
a separate function.
Add QFontInfo::styleName() and QRawFont::styleName() to access
the resolved style name for a font.
Task-number: QTBUG-19366
Change-Id: Iad07768c02ed06cc8d6b7395dec554384f410506
Reviewed-on: http://codereview.qt.nokia.com/333
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Gunnar Sletta [Wed, 8 Jun 2011 11:12:21 +0000 (13:12 +0200)]
Duplicate some harfbuzz symbols inside Qt.
This is done to remove a compile-time dependency on the harfbuzz
source files inside qtbase/src/3rdparty. These are not accessible
now that QT_SOURCE_TREE is not accessible as a qmake variable
anymore.
With the refactor branch we might solve this differently, but for
now this is how we get svg and declarative to compile.
Change-Id: I5dad23f2ea1f650e2621c1c1fcf39632a3a22ae8
Reviewed-on: http://codereview.qt.nokia.com/378
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Eckhart Koppen [Thu, 9 Jun 2011 08:21:26 +0000 (11:21 +0300)]
Use homePath instead of homeDirPath
homeDirPath requires Qt 3 support, which is not enabled in all
configurations.
Change-Id: I7d51b880574021ef4569a4a2b16f06a7786dbb7d
Reviewed-on: http://codereview.qt.nokia.com/415
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Morten Sorvig [Thu, 9 Jun 2011 09:18:27 +0000 (11:18 +0200)]
Add QEventDispatcherMac.
Create it directly in QGuiApplication for now,
later on we'll move it to the cocoa plugin.
Morten Sorvig [Thu, 9 Jun 2011 09:13:49 +0000 (11:13 +0200)]
Remove QPlatformEventLoopIntegration.
Instead we'll let the platform plugins construct
an QEventDispatcherQPA subclass. This API will be
added later on.
This temporarily breaks cocoa, uikit and opencode.
Laszlo Agocs [Thu, 9 Jun 2011 09:05:56 +0000 (11:05 +0200)]
Bail out from cursor creation when malloc fails.
Laszlo Agocs [Thu, 9 Jun 2011 08:39:08 +0000 (10:39 +0200)]
Get modifier mapping using standard X, no need for libxkbcommon here.
Reviewed-by: Samuel Rødal
Laszlo Agocs [Wed, 8 Jun 2011 15:41:12 +0000 (17:41 +0200)]
Create custom cursors via XRender.
Reviewed-by: Samuel Rødal
Pierre Rossi [Fri, 20 May 2011 12:16:33 +0000 (14:16 +0200)]
Add tilde (both ~ and ~<user>) expansion to QFileDialog on UNIX.
Task-number: QTBUG-3265
Change-Id: Id8062afe69e798e1f9cf3f4e967ae0d30c362b72
Reviewed-on: http://codereview.qt.nokia.com/411
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Marius Storm-Olsen [Wed, 8 Jun 2011 17:47:56 +0000 (12:47 -0500)]
Fix modules to load(qt_module) first
Change-Id: Iabdfffff09088243863a8661add73298ed8baaf3
Reviewed-on: http://codereview.qt.nokia.com/413
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Marius Storm-Olsen [Wed, 8 Jun 2011 17:01:24 +0000 (12:01 -0500)]
Complain if we don't load(qt_module) first
Not having load(qt_module) first in a .pro file which later
does a load(qt_module_config) will likely overwrite
compiler/linker options in the .pro file.
This can be hard to figure out, and wasn't required before
when we used a global .qmake.cache for all modules, since
it 'preloaded' qmodule.pri file for all .pro files.
Change-Id: I8a9aa3247f938be0b3b13f8c8cc96c18a142ba7b
Reviewed-on: http://codereview.qt.nokia.com/412
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Laszlo Agocs [Tue, 7 Jun 2011 13:38:45 +0000 (15:38 +0200)]
Cursor support in xcb plug-in.
Custom cursor pixmaps with depth greater than 1 are not yet supported
and will be converted to monochrome always.
Reviewed-by: Samuel Rødal
Lars Knoll [Wed, 8 Jun 2011 12:24:17 +0000 (14:24 +0200)]
Avoid out of bounds write
Reviewed-by: Samuel
Marius Storm-Olsen [Wed, 8 Jun 2011 11:15:01 +0000 (06:15 -0500)]
Fix typo from
1835afe6
Change-Id: I99e4407bbcb82cb27057ada838d73b6582867937
Reviewed-on: http://codereview.qt.nokia.com/379
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Olli Werwolff [Wed, 8 Jun 2011 10:34:29 +0000 (12:34 +0200)]
Undefine DrawText in qlineedit.cpp
There is a #define DrawText DrawTextW in winuser.h which is included
in windows.h so that the enum value in line 1981 is seen as DrawTextW
and thus is not a valid enum value on Windows.
Reviewed-by: Samuel
Reviewed-by: Lars Knoll
Olli Werwolff [Wed, 8 Jun 2011 09:48:38 +0000 (11:48 +0200)]
Most checks for windows in widgets have to be ws specific
Reviewed-by: Samuel
Reviewed-by: Lars Knoll
Olli Werwolff [Wed, 8 Jun 2011 11:39:21 +0000 (13:39 +0200)]
use correct includes in qaccessible_win.cpp/qwizard_win_p.h
Reviewed-by: Samuel
Reviewed-by: Lars Knoll
Olli Werwolff [Wed, 8 Jun 2011 09:46:12 +0000 (11:46 +0200)]
Do not compile _win files when -qpa is used
Reviewed-by: Samuel
Reviewed-by: Lars Knoll
Olli Werwolff [Wed, 8 Jun 2011 07:36:27 +0000 (09:36 +0200)]
QTextDocumentLayout has to be exported as it is used in widgets
Reviewed-by: Samuel
Reviewed-by: Lars Knoll
Olli Werwolff [Wed, 8 Jun 2011 07:35:38 +0000 (09:35 +0200)]
Fixed compilation with QT_NO_PRINTER
Reviewed-by: Samuel
Reviewed-by: Lars Knoll
Lars Knoll [Wed, 8 Jun 2011 11:46:09 +0000 (13:46 +0200)]
cosmetic changes
Jiang Jiang [Wed, 8 Jun 2011 08:11:10 +0000 (10:11 +0200)]
Reorder member varibles in QGlyphRunPrivate to eliminate warning
Reviewed-by: Eskil
(cherry picked from commit
74a1135341783449970d579b273d00c837ac14b0)
Change-Id: I8e1c6bdc7f0957d8f389531f5f5682c536cdc286
Reviewed-on: http://codereview.qt.nokia.com/374
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Jiang Jiang [Sat, 4 Jun 2011 13:53:49 +0000 (15:53 +0200)]
Fix warning in qtextengine compilation
enableHarfbuzz() should only be defined on Mac.
Reviewed-by: Eskil
(cherry picked from commit
5ce3fbb67b79c3732fd47b296ef9421398ca520c)
Change-Id: I9ecb5db49478c3f5beb5d41cf99320f0faedce2e
Reviewed-on: http://codereview.qt.nokia.com/375
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Jiang Jiang [Sat, 4 Jun 2011 15:47:13 +0000 (17:47 +0200)]
Fix compile when configure with no fontconfig support
Task-number: QTBUG-19716
Reviewed-by: Eskil
(cherry picked from commit
5a598afa3f1928e9ad18257e2fa48fe3d5739917)
Change-Id: I05107970e3273fce48303c9956e1c9aa928832b9
Reviewed-on: http://codereview.qt.nokia.com/376
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Lars Knoll [Tue, 7 Jun 2011 19:53:52 +0000 (21:53 +0200)]
Fix behaviour after WM_TAKE_FOCUS
We should not call requestActivateWindow() in
reaction to WM_TAKE_FOCUS. Looks like it should
only be done if the focus should in fact go
to a modal child of the widget.
Olli Werwolff [Wed, 8 Jun 2011 07:51:07 +0000 (09:51 +0200)]
Use Q_WIDGETS_EXPORT for widgets library
Reviewed-by: Lars Knoll
Marius Storm-Olsen [Tue, 7 Jun 2011 18:43:17 +0000 (13:43 -0500)]
Fix usage of QT_SOURCE_TREE
Functionality has been moved into qt_example.prf
Change-Id: I81423eb4c5645f03b131932b2d37eceee9fea086
Reviewed-on: http://codereview.qt.nokia.com/371
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Lars Knoll [Tue, 7 Jun 2011 14:45:28 +0000 (16:45 +0200)]
revert accidental commit
Lars Knoll [Tue, 7 Jun 2011 14:44:23 +0000 (16:44 +0200)]
remove unused code
Lars Knoll [Tue, 7 Jun 2011 14:29:35 +0000 (16:29 +0200)]
cleanups code
Make QXcbClipboard and QXcbDrag a QXcbObject to simplify
the code.
Use the predefined atoms in xproto.h instead of our own
defines.
Lars Knoll [Tue, 7 Jun 2011 13:07:44 +0000 (15:07 +0200)]
Implement QDropEvent::source() again
QDropEvent::source() now returns a QObject
instead of a widget, matching the implementation
in QDrag.
Reviewed-by: Samuel
Lars Knoll [Tue, 7 Jun 2011 13:06:53 +0000 (15:06 +0200)]
reset certain global variables on deletion
qt_button_down needs to be reset to 0 if it
points to the widget being deleted.
Reviewed-by: Samuel
Lars Knoll [Tue, 7 Jun 2011 13:04:55 +0000 (15:04 +0200)]
Protect against deleted windows
Check that the window is still there before
trying to deliver an event to it.
Reviewed-by: Samuel
Lars Knoll [Tue, 7 Jun 2011 13:04:35 +0000 (15:04 +0200)]
Initialize variable
Reviewed-by: Samuel