Paul Olav Tvete [Fri, 19 Aug 2011 10:50:18 +0000 (12:50 +0200)]
make 'make install' install
Change-Id: I766e7917f6362b1f9cc26d18381e8d76eaf6ff83
Reviewed-on: http://codereview.qt.nokia.com/3261
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Friedemann Kleint [Tue, 23 Aug 2011 10:45:51 +0000 (12:45 +0200)]
Fix input context header.
Rubber-stamped-by: Lars Knoll <lars.knoll@nokia.com>
Change-Id: Ia5dfccfa53fea68889c312a645597aaf40ddc079
Reviewed-on: http://codereview.qt.nokia.com/3397
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Morten Sorvig [Fri, 19 Aug 2011 12:27:58 +0000 (14:27 +0200)]
Mac: Fix link error in printdialog.
Recompiling QtWidgets on Mac fails with:
"ld: duplicate symbol qInitResources_qprintdialog() in
.obj/debug-shared/qrc_qprintdialog.o and
.obj/debug-shared/qprintdialog_unix.o "
Ifdef out the include from qprintdialog_unix,
leaving us with one instance of the synbol.
Change-Id: I7e1f45de65020253e0cad4155fca94944e66c177
Reviewed-on: http://codereview.qt.nokia.com/3270
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Olli Werwolff [Mon, 22 Aug 2011 06:18:22 +0000 (08:18 +0200)]
Fixed empty if statement in QWindow.cpp
Change-Id: Ib324eb30da1e16f01b9655ed293244fb50b621b8
Reviewed-on: http://codereview.qt.nokia.com/3289
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Samuel Rødal [Thu, 18 Aug 2011 08:50:18 +0000 (10:50 +0200)]
Make the hellowindow example multi-threaded to stress the GL backend.
Change-Id: I9e158c0889b050f9ed76ea21176102fc792eef83
Reviewed-on: http://codereview.qt.nokia.com/3150
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Samuel Rødal [Wed, 10 Aug 2011 08:02:22 +0000 (10:02 +0200)]
Prevent X errors being generated when setting 0 as width or height.
Change-Id: I38b12471f2c327952c4b5f6acb01c1f1ef53da28
Reviewed-on: http://codereview.qt.nokia.com/2823
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Friedemann Kleint [Fri, 19 Aug 2011 09:22:17 +0000 (11:22 +0200)]
Fix colormap exports/warning in qapplication_p.h
Change-Id: I294e19e7fdf6ab65b5f8ba09d14263487c85b866
Reviewed-on: http://codereview.qt.nokia.com/3256
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Friedemann Kleint [Fri, 19 Aug 2011 09:07:36 +0000 (11:07 +0200)]
Fix comparison.
Change-Id: Id90a49e57d25d12936678fecfa9c4e0c6dbe676b
Reviewed-on: http://codereview.qt.nokia.com/3255
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Friedemann Kleint [Fri, 19 Aug 2011 08:04:51 +0000 (10:04 +0200)]
QSurfaceFormat: Add missing 'profile' accessors, fix detaching.
No longer initialize FormatOptions to SwapBehaviour::DoubleBuffer
in the constructor as it is a different enumeration.
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Change-Id: Id69e0345d4395ee88532ac3ee0e89c35e6c5b083
Reviewed-on: http://codereview.qt.nokia.com/3254
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Lars Knoll [Fri, 19 Aug 2011 07:27:51 +0000 (09:27 +0200)]
Remove qtessellator.* from QtGui
It's now unused since the GL1 paintengine is gone.
Change-Id: I1415b725dc05aab920670976a8eb8c3145464297
Reviewed-on: http://codereview.qt.nokia.com/3246
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Friedemann Kleint [Fri, 19 Aug 2011 08:39:45 +0000 (10:39 +0200)]
Fix build.
- Introduced EXPORT definition for new QPrintSupport library.
- Fixed dependencies in src.pro
- Fixed some includes.
Change-Id: I9863233ca2767928b37cf3fd1fdec31351b5da6b
Reviewed-on: http://codereview.qt.nokia.com/3253
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Lars Knoll [Fri, 19 Aug 2011 07:25:54 +0000 (09:25 +0200)]
QColormap is gone from QtGui
Fixes compilion of Gui
Change-Id: I5b66b3d3817d8e54c990d761bb8e8b591fa0da63
Reviewed-on: http://codereview.qt.nokia.com/3245
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Lars Knoll [Tue, 16 Aug 2011 12:39:54 +0000 (14:39 +0200)]
Remove Type1 support
Type1 support was only required for postscript
generation. As we don't support this anymore, get
rid of this code.
Change-Id: Ifdc27ec563b5da8d94554f8b078bcd3ac079d201
Reviewed-on: http://codereview.qt.nokia.com/3214
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Lars Knoll [Thu, 18 Aug 2011 09:04:06 +0000 (11:04 +0200)]
Restore feature compatibility with QPrinter in QTextDocument::print
Add a margin method to QPagedPaintDevice. The other variables
required are stored in QPagedPaintDevicePrivate without a
public API for now. This needs cleaning up once we have a new
printing system.
Change-Id: Id3f2d7ac7f3cbce8619072a897d91f3a588add64
Reviewed-on: http://codereview.qt.nokia.com/3211
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Lars Knoll [Wed, 17 Aug 2011 12:20:53 +0000 (14:20 +0200)]
Move the printer support backend into it's own plugin
QPlatformIntegration can't have a dependency onto printing
anymore now that printing lives in it's own library. Move
it into a plugin of it's own.
Change-Id: I3ec4b38f4336eb96d92ea799544d17af359c83e1
Reviewed-on: http://codereview.qt.nokia.com/3210
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Lars Knoll [Tue, 16 Aug 2011 14:38:56 +0000 (16:38 +0200)]
Move printing into it's own library
Create a libQtPrintSupport library that contains our current
printing infrastructure. Long term this will get replaced
with a libQtPrint, as the current architecture is not
really maintainable.
Change-Id: I7362fff6786b58c5b4e9213c23eda36d15048aa2
Reviewed-on: http://codereview.qt.nokia.com/3209
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Lars Knoll [Wed, 17 Aug 2011 13:44:59 +0000 (15:44 +0200)]
Don't rely on QPrinter in widgets
Use the QPagedPaintDevice instead for the current
print() methods. Like this we can move the whole
printing system into it's own library.
Change-Id: I5e23fb3a9304eb3d12aa54959893601566249e23
Reviewed-on: http://codereview.qt.nokia.com/3208
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Lars Knoll [Tue, 16 Aug 2011 12:04:48 +0000 (14:04 +0200)]
Use the paged paintdevice in the print() method of QTextDocument.
This is required to be able to move the printing system into
it's own library.
Change-Id: If70a55be4c4413f9cd917a30d1b368f32c1145e4
Reviewed-on: http://codereview.qt.nokia.com/3207
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Lars Knoll [Wed, 17 Aug 2011 09:26:51 +0000 (11:26 +0200)]
Introduce a paged paintdevice and use it
Introduce a QPagedPaintDevice class that has a
newPage() method and page dimensions. QPdfWriter
and QPrinter inherit from it.
Add a bit of API to QPdfWriter.
Change-Id: Ibf23e7fe741f3a5ed854faf5d249a272acc75f35
Reviewed-on: http://codereview.qt.nokia.com/3206
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Lars Knoll [Tue, 16 Aug 2011 11:53:57 +0000 (13:53 +0200)]
move printing related files into their own directory
This is done to prepare the next step where we move
printing into it's own module.
Change-Id: I95919c28079983e7c5e4ff23d223f8c062b8ac8c
Reviewed-on: http://codereview.qt.nokia.com/3205
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Lars Knoll [Tue, 16 Aug 2011 09:43:58 +0000 (11:43 +0200)]
PDF doesn't require the alpha paintengine
Remove the inheritance from the alpha paint engine
for the PDF generator. The alpha engine was only
required to support transparency on Postscript.
Change-Id: If09a00a3123f73e4c36f708651a3abae014187a3
Reviewed-on: http://codereview.qt.nokia.com/3204
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Lars Knoll [Tue, 16 Aug 2011 09:34:01 +0000 (11:34 +0200)]
Move the remaining QPrinter dependencies out of qpf.*
Change-Id: I4fd0158d65afad1bc67c52eff17ce2e12ff60641
Reviewed-on: http://codereview.qt.nokia.com/3203
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Lars Knoll [Mon, 15 Aug 2011 11:44:46 +0000 (13:44 +0200)]
Rename QPdf(Base)Engine
Rename QPdfBaseEngine to QPdfEngine and QPdfEngine
to QPdfPrintEngine. This fit's better with the use cases.
Change-Id: Ic208b079581768a957f9fdcc333f0bf87f619d46
Reviewed-on: http://codereview.qt.nokia.com/3202
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Lars Knoll [Fri, 12 Aug 2011 12:20:08 +0000 (14:20 +0200)]
Move the PDF related functionality into QPdf
Goal is to have all functionality related to PDF generation
in QPdf, and then separate out the parts related to
interfacing with the printing system into the pdf printengine.
Change-Id: I8c30cb65365c503945fc270fad5cbcaabe59495d
Reviewed-on: http://codereview.qt.nokia.com/3201
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Lars Knoll [Fri, 12 Aug 2011 12:19:23 +0000 (14:19 +0200)]
first version of a public API to generate PDFs
The class is required to be able to move the printing
subsystem out into a module of it's own.
Change-Id: I80703b8a8725504c7e6884a34f76e0735efcf95a
Reviewed-on: http://codereview.qt.nokia.com/3200
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Lars Knoll [Tue, 16 Aug 2011 12:47:43 +0000 (14:47 +0200)]
Move QColorMap into QtWidgets
Remove the remaining dependency in qnativeimage
and move the whole class into QtGui for compatibility.
The class is not needed anymore since we're not going
to support 8bit/indexed displays going forward.
Change-Id: I7b5f1b2a5661db4ed77bb3801039114c7518512d
Reviewed-on: http://codereview.qt.nokia.com/3199
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Friedemann Kleint [Wed, 17 Aug 2011 13:58:39 +0000 (15:58 +0200)]
Add Windows to the Lighthouse.
Add an initial Lighthouse plugin for the Windows operating system.
Change-Id: I6934562266e1aa0ac270bf6107df05a9e56ef82c
Reviewed-on: http://codereview.qt.nokia.com/3107
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Gunnar Sletta [Thu, 18 Aug 2011 06:23:15 +0000 (08:23 +0200)]
Enable multisampling and swap interval by default on cocoa
Change-Id: If3d1939e6196f5aa6654645d20dab7ad251046fa
Reviewed-on: http://codereview.qt.nokia.com/3138
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Morten Sorvig [Mon, 15 Aug 2011 11:11:50 +0000 (13:11 +0200)]
Set the style mask manually.
Looks like the window flags conversion code from
Qt 4 is not working, set a style mask suitable
for qmlscene for now.
Change-Id: I5e672f586045a0f0403f6b75252f0029c8d8a205
Reviewed-on: http://codereview.qt.nokia.com/2956
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Morten Sorvig [Mon, 15 Aug 2011 11:50:22 +0000 (13:50 +0200)]
Fix crash-on-exit in qmlscene.
Take control over NSWindow deletion to make sure
it's lifetime matches that of the QCocoaWindow.
Change-Id: Ia10006d814345356e6aebe7fa1f9a0e012535786
Reviewed-on: http://codereview.qt.nokia.com/2960
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Morten Sorvig [Mon, 15 Aug 2011 11:09:18 +0000 (13:09 +0200)]
Create NSWindow subclass.
Allows us to override canBecomeKeyWindow etc.
Change-Id: Ia74006ac85acb98e8a0fe0a8cdc8e5e0b9aee5c4
Reviewed-on: http://codereview.qt.nokia.com/2955
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Morten Sorvig [Fri, 12 Aug 2011 11:39:23 +0000 (13:39 +0200)]
Cocoa: Remove autorelease warnings from qmlscene.
The SG Canvas render thread was creating a
QCocoaGLContext without an autorelease pool in
place.
Change-Id: I08882f42efdf905107497e8be21f2a2d20c3c4cf
Reviewed-on: http://codereview.qt.nokia.com/2911
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Olli Werwolff [Wed, 17 Aug 2011 07:59:08 +0000 (09:59 +0200)]
Readded (and fixed) WindowsXP and -Vista styles
There are still issues in WindowsVista style and qwizard_win's icon will
not be shown but these will be fixed in upcoming commits.
Change-Id: I22705694f07bea7461333b053804a09bab661706
Reviewed-on: http://codereview.qt.nokia.com/3073
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Gunnar Sletta [Wed, 17 Aug 2011 10:03:24 +0000 (12:03 +0200)]
compile after removal of OpenGL 1 paint engine
Change-Id: Idf030ef627329f940e8a1e0a2b98d49b11e8446c
Reviewed-on: http://codereview.qt.nokia.com/3087
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Paul Olav Tvete [Wed, 17 Aug 2011 09:47:25 +0000 (11:47 +0200)]
Build fix after setPreferredPaintEngine was removed
Change-Id: I286529e0e1917ee3c808eba7dad0957dd4d8194f
Reviewed-on: http://codereview.qt.nokia.com/3083
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Gunnar Sletta [Wed, 17 Aug 2011 06:16:56 +0000 (08:16 +0200)]
Make configure work again..
Change-Id: I40d840c079a89fd127cf2d8ab97c1f8f3cb6525f
Reviewed-on: http://codereview.qt.nokia.com/3065
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Samuel Rødal [Tue, 16 Aug 2011 10:53:04 +0000 (12:53 +0200)]
Get rid of OpenGL 1.x engine and platform code from QtOpenGL.
Change-Id: I646b8e26d5e7214432a044866764d57cc11b2390
Reviewed-on: http://codereview.qt.nokia.com/3006
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Samuel Rødal [Wed, 10 Aug 2011 12:14:22 +0000 (14:14 +0200)]
Don't set platform input context if it's not properly created.
Prevent xcb applications from failing to launch when IBus is not
initialized correctly.
Change-Id: I8425403e02d0eb5401f8d8bb0d012b53ab9400d9
Reviewed-on: http://codereview.qt.nokia.com/3044
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
Samuel Rødal [Tue, 16 Aug 2011 07:28:01 +0000 (09:28 +0200)]
Get rid of unused convenience class in QtOpenGL.
QGLContextResource is no longer used, QGLContextGroupResource should be
preferable in all situations.
Change-Id: I7c7b90686959ced9fa34e278ef5747a7c49a5b03
Reviewed-on: http://codereview.qt.nokia.com/3005
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Morten Sorvig [Tue, 16 Aug 2011 07:25:50 +0000 (09:25 +0200)]
Cocoa: Fix flicker on window resize.
During window resizing the geometry change events
must be processed before returning from the event
handler.
New API: QWindowSystemInterface::handleSynchronousGeometryChange,
similar to handleGeometryChange but sends the event
immediately instead of queueing it.
Change-Id: I7dc809b3fd2e8a933c100fef3f5144972f46e363
Reviewed-on: http://codereview.qt.nokia.com/2993
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Olli Werwolff [Mon, 15 Aug 2011 12:07:56 +0000 (14:07 +0200)]
Disable WindowsXP/-Vista styles for now
As these styles need functionality from qregion_win
we disable them for now.
Change-Id: I0d5d38f2f684d1ee619967341849d891d17c75e6
Reviewed-on: http://codereview.qt.nokia.com/2964
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Olli Werwolff [Mon, 15 Aug 2011 12:06:51 +0000 (14:06 +0200)]
Fix typo in qapplication test
Change-Id: I84f1257e3483a629ea8cfca041710bdbfbd8f3ba
Reviewed-on: http://codereview.qt.nokia.com/2963
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Olli Werwolff [Tue, 12 Jul 2011 12:44:50 +0000 (14:44 +0200)]
Fixed compilation of qfiledialog_win.cpp
Change-Id: I2c84d8f55df5a35b1cc335fdb59a27f2d3d3bad6
Reviewed-on: http://codereview.qt.nokia.com/2962
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Jørgen Lind [Thu, 11 Aug 2011 13:13:48 +0000 (15:13 +0200)]
Fix platformsupport as installable module
Change-Id: I17c4723c551c1cee9c442e8d6c1289bccf505d3d
Reviewed-on: http://codereview.qt.nokia.com/2868
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andy Nichols
Morten Sorvig [Thu, 11 Aug 2011 09:08:30 +0000 (11:08 +0200)]
Cocoa: Set child window geometry correctly.
Qt child window geometry is in the parent window
coordinate space, convert from/to OS X screen
coordinates when needed.
Change-Id: I50d35dd35e51af8fc161ec363c0e996a0e8aa9f3
Reviewed-on: http://codereview.qt.nokia.com/2859
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Morten Sorvig [Tue, 9 Aug 2011 11:40:15 +0000 (13:40 +0200)]
Configure: Make QPA default when building on OS X
Minimal patch to change the default. PLATFORM_MAC
is now obsolete, and at some point we need to go
through configure and remove it or replace usages
with for example BULD_ON_MAC.
Change-Id: Ic6a8609158b6021ead23d8731e683ef3a51cc4d7
Reviewed-on: http://codereview.qt.nokia.com/2780
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Morten Sorvig [Thu, 11 Aug 2011 10:27:29 +0000 (12:27 +0200)]
Cocoa: Activate Qt apps on startup.
This prevents Qt apps from launching behind the
terminal and QProcess parent apps, which is the
native OS X but not the cross-platform Qt behavior.
This reverses the change made mid 4.x series and
reverts back to the "old" Qt 4 behavior
Change-Id: I99d9f95980db884f8614ec2df663305505e08531
Reviewed-on: http://codereview.qt.nokia.com/2858
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Gunnar Sletta [Thu, 11 Aug 2011 08:44:39 +0000 (10:44 +0200)]
include .cc and .CC in fix headers script
Change-Id: Ie8903d59013535e04537c1a5b50fa710a02cb8f0
Reviewed-on: http://codereview.qt.nokia.com/2849
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Gunnar Sletta [Wed, 10 Aug 2011 13:36:51 +0000 (15:36 +0200)]
Implement "quit on last window closed" logic for QWindow
Change-Id: Ide33578ad60796f3e267b09be76cda87eaf873d0
Reviewed-on: http://codereview.qt.nokia.com/2827
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Samuel Rødal [Wed, 10 Aug 2011 12:14:22 +0000 (14:14 +0200)]
Don't try to use IBUS when dbus is not configured.
Change-Id: I315ef3d834e923b649e4306866666549852c254f
Reviewed-on: http://codereview.qt.nokia.com/2825
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
Samuel Rødal [Wed, 10 Aug 2011 06:33:30 +0000 (08:33 +0200)]
Removed unnecessary debug output in xcb plugin.
Change-Id: I3b354a8649971a5d8c68a0b4f6bbdf6475116d65
Reviewed-on: http://codereview.qt.nokia.com/2808
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Samuel Rødal [Mon, 8 Aug 2011 10:39:38 +0000 (12:39 +0200)]
Made QWindow::setVisible() send show and hide events.
Change-Id: Ideae15f7bd6801d7afe2354627c0893b0b6a32ca
Reviewed-on: http://codereview.qt.nokia.com/2741
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Matthew Cattell [Tue, 9 Aug 2011 16:01:49 +0000 (18:01 +0200)]
build without dbus
Change-Id: I5af35ff094bea08c83f0e65e72efa59adac2581c
Reviewed-on: http://codereview.qt.nokia.com/2790
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Samuel Rødal [Tue, 9 Aug 2011 12:32:48 +0000 (14:32 +0200)]
Removed Q_XCB_NOOP's from QGLXContext.
QGLXContext might be used from different threads than the gui thread, so
don't trigger any XCB logging from there.
Change-Id: I96a51ebf6987749d209b447c9ae2ac8b7298bd4c
Reviewed-on: http://codereview.qt.nokia.com/2782
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Samuel Rødal [Tue, 9 Aug 2011 12:45:13 +0000 (14:45 +0200)]
Removed QPaintDevice dependency in blitFramebuffer().
Change-Id: I7294be5c4447d7e24dda95b822a9ce7b2abbccc4
Reviewed-on: http://codereview.qt.nokia.com/2783
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Gunnar Sletta [Tue, 9 Aug 2011 07:19:22 +0000 (09:19 +0200)]
Get linux input plugin compiling by removing keyboard support
Change-Id: I46ade27b5dde6c8d326a84e94abbbde1435889f8
Reviewed-on: http://codereview.qt.nokia.com/2765
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Gunnar Sletta [Fri, 5 Aug 2011 11:35:57 +0000 (13:35 +0200)]
make eglfs compile
Change-Id: I724b700ed87cbc5d69647032c0c9c8e7e1d82748
Reviewed-on: http://codereview.qt.nokia.com/2689
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Gunnar Sletta [Mon, 8 Aug 2011 07:23:19 +0000 (09:23 +0200)]
Implement map/unmap and force geometry EglFS
Change-Id: Ia2d86e84acfeb30f41b06f106b93033fe54ed839
Reviewed-on: http://codereview.qt.nokia.com/2730
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Samuel Rødal [Fri, 5 Aug 2011 14:32:56 +0000 (16:32 +0200)]
Properly initialize window properties in xcb plugin.
Since
833090abb9a277 these need to be called manually.
Change-Id: Iabc263d499e724d4d39c3d8350563feb57749879
Reviewed-on: http://codereview.qt.nokia.com/2704
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Samuel Rødal [Fri, 5 Aug 2011 10:11:40 +0000 (12:11 +0200)]
Get wayland plugin working after latest QPA API changes.
Change-Id: If54e7068aaed84fe765b887250bca79c787bd8a3
Reviewed-on: http://codereview.qt.nokia.com/2684
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Samuel Rødal [Fri, 5 Aug 2011 07:21:34 +0000 (09:21 +0200)]
Get rid of missing qmake warning.
Change-Id: I470e89cb5b2042cda1811ef327e0703c7510fd08
Reviewed-on: http://codereview.qt.nokia.com/2683
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Gunnar Sletta [Thu, 4 Aug 2011 08:46:27 +0000 (10:46 +0200)]
Added some convenience to QWindow
Change-Id: I367f5e3f586661322184cfa5f7653814569cb6e3
Reviewed-on: http://codereview.qt.nokia.com/2611
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Friedemann Kleint [Thu, 4 Aug 2011 08:36:48 +0000 (10:36 +0200)]
Add WindowStateChanged event.
Not currently considering activation state.
Change-Id: Iea9265d35536947b6cc85639bd9839e9fda69bdf
Reviewed-on: http://codereview.qt.nokia.com/2609
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Gunnar Sletta [Thu, 28 Jul 2011 08:15:18 +0000 (10:15 +0200)]
Undefine "slots" before including cocoa headers to make it compile
Change-Id: Id2ba9d657a93e0d10b70b31b6a44a6ea9f598d8f
Reviewed-on: http://codereview.qt.nokia.com/2328
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Jørgen Lind [Thu, 4 Aug 2011 06:49:01 +0000 (08:49 +0200)]
Fix wayland config test
Change-Id: Ifb002fdcec8ce359e3393c9f9fa2809e136d782c
Reviewed-on: http://codereview.qt.nokia.com/2600
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Jørgen Lind [Thu, 4 Aug 2011 06:19:14 +0000 (08:19 +0200)]
compile fix for compiling without ssl
Change-Id: I48942dd437f9475c8584d5aef176f71464ae86be
Reviewed-on: http://codereview.qt.nokia.com/2598
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Jørgen Lind [Thu, 4 Aug 2011 07:14:17 +0000 (09:14 +0200)]
Merge "Merge remote branch 'gerrit/master' into refactor" into refactor
Andy Nichols [Tue, 2 Aug 2011 13:07:50 +0000 (15:07 +0200)]
Initial support for Qt using Kernel Mode-setting (KMS)
This platform plugin supports fullscreen OpenGLES2 windows on devices
that support Kernel Mode-setting.
Change-Id: I7d4077319654c13851f0ff7ec0228b7b13936382
Reviewed-on: http://codereview.qt.nokia.com/2516
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Richard Moe Gustavsen [Wed, 3 Aug 2011 13:08:38 +0000 (15:08 +0200)]
Mac: fix crash when creating a new window
Change-Id: I90f7bff954f3710f48d7416287bb5debafa94447
Reviewed-on: http://codereview.qt.nokia.com/2570
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Friedemann Kleint [Wed, 3 Aug 2011 12:50:40 +0000 (14:50 +0200)]
QPlatformFontDatabase: Add default fonts.
Add a default font accessor used to initalize QGuiApplication::font().
Add accessor for default font hash providing the defaults for
QApplication::font(const char *widgetClassName).
Change-Id: Ie4eb6edb251a81e81288ef480ae5550bd1125008
Reviewed-by: Samuel Rødal <sroedal@trolltech.com>
Reviewed-on: http://codereview.qt.nokia.com/2567
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Samuel Rødal [Wed, 3 Aug 2011 09:03:22 +0000 (11:03 +0200)]
Merge remote branch 'gerrit/master' into refactor
Conflicts:
src/gui/kernel/qapplication_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/gui/widgets/qlinecontrol_p.h
src/gui/widgets/qtabwidget.h
Change-Id: I90ba893a5553b9ff5658ca0a3221ecf76be4c736
Jørgen Lind [Wed, 3 Aug 2011 07:05:41 +0000 (09:05 +0200)]
ibus depends on dbus
Change-Id: I9f38eaa84bf5befb6b37c2a55405d85b71cf4c95
Reviewed-on: http://codereview.qt.nokia.com/2543
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Friedemann Kleint [Tue, 2 Aug 2011 13:58:48 +0000 (15:58 +0200)]
Fix QString/QByteArray literals for MSVC2010 (compilation of tests).
- Specify return type of QByteArrayLiteral/QStringLiteral lambdas.
- Define QT_UNICODE_LITERAL instead of QT_UNICODE_MARKER.
Change-Id: I8a53506887d2736b093798220b088f645f05e415
Reviewed-on: http://codereview.qt.nokia.com/2514
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Richard Moe Gustavsen [Tue, 2 Aug 2011 13:17:10 +0000 (15:17 +0200)]
Mac: build fix
qtbase failed building on Mac OS 10.5 and 10.6. This patch
just rearrange some headers etc
Change-Id: If85ac69029533a195249e84f8803ced6c0ff22b6
Reviewed-on: http://codereview.qt.nokia.com/2517
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
Rohan McGovern [Tue, 2 Aug 2011 06:41:47 +0000 (16:41 +1000)]
test: mark tst_qtconcurrentfilter as insignificant on Linux
This test fails pseudorandomly, which makes the result insignificant
for the purpose of detecting regressions.
Task-number: QTBUG-20688
Change-Id: I3274953841a553e35b4eb844702868f2f9ec0525
Reviewed-on: http://codereview.qt.nokia.com/2491
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Rohan McGovern [Tue, 2 Aug 2011 03:47:31 +0000 (13:47 +1000)]
test: mark tst_qabstractnetworkcache as insignificant
This test crashes pseudorandomly, which makes the result insignificant
for the purpose of detecting regressions.
Task-number: QTBUG-20686
Change-Id: I3079d935d46a4bcd2b119c2b9b452f0b69dccf21
Reviewed-on: http://codereview.qt.nokia.com/2479
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Rohan McGovern [Tue, 2 Aug 2011 07:06:34 +0000 (17:06 +1000)]
Make failure messages from tst_QSslCertificate::verify much more useful
Changes the failure message from the previously brief:
'(errors.count() == 0)' returned FALSE.
To the vastly more useful:
'(errors.count() == 0)' returned FALSE.
(errors: [ "The certificate has expired" ])
Change-Id: I587cd8ddfd3c17e273220bc95691b3dc92390547
Reviewed-on: http://codereview.qt.nokia.com/2241
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Jason McDonald [Tue, 2 Aug 2011 04:20:34 +0000 (14:20 +1000)]
Eliminate reference to Trolltech.
Task-number: QTBUG-19653
Change-Id: If3c822dd59ccbdd03037068acfe902ed9688a874
Reviewed-on: http://codereview.qt.nokia.com/2482
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Rohan McGovern [Tue, 2 Aug 2011 01:35:01 +0000 (11:35 +1000)]
test: skip some tst_qtextscriptengine tests when fonts are missing
This autotest may fail depending on the version of fonts which are
installed on the system. It has no way to verify if the correct fonts
are installed, and it's unclear from where the correct version of the
fonts may be obtained.
Therefore, disable the test by default unless the user has indicated
that they have a correct setup by setting QT_HAVE_TEST_FONTS=1.
Task-number: QTBUG-20682
Change-Id: I24174520f54af6a9b2c13c9c1347f46555bce3d4
Reviewed-on: http://codereview.qt.nokia.com/2469
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Thorbjørn Lindeijer [Mon, 18 Apr 2011 15:20:49 +0000 (17:20 +0200)]
Introduced a CONFIG option that enables declarative debug services
This replaces the need for applications to explicitly make a call to
enable the debug services, and rather does it in declarative.h when the
'declarative_debug' CONFIG option is used.
Done-with: Kai Koehne
Reviewed-by: Martin Jones
Reviewed-by: Michael Brasser
(cherry-picked from commit
5517cc588c39814530b8bfd957821f55be42acf2)
Change-Id: If180d2b826879d6d02c7be4d3075917815ccf349
Reviewed-on: http://codereview.qt.nokia.com/2435
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Rohan McGovern [Mon, 1 Aug 2011 04:38:36 +0000 (14:38 +1000)]
test: remove CONFIG+=insignificant_test for tst_qgraphicstransform
This autotest failure is stable, so it should be marked with
QEXPECT_FAIL, not CONFIG+=insignificant_test.
Note that the test row naming had to be changed, as the test previously
created many rows of testdata with the same name, making it impossible
to skip only the broken rows.
Task-number: QTBUG-20661
Change-Id: Ie38f5dddafe7686e30eaa8ff3445310935d2cd9a
Reviewed-on: http://codereview.qt.nokia.com/2419
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Rohan McGovern [Mon, 1 Aug 2011 06:44:09 +0000 (16:44 +1000)]
test: fixed failure of tst_qicon
This test unconditionally assumed that SVG support was available.
This is an invalid circular dependency: the test is in qtbase and
depends on qtsvg, which depends on qtbase.
Change the test so that it uses SVG support only if available.
Change-Id: Ia63ce74abdecd4bcf7a4e0714b8cb7c488e17495
Reviewed-on: http://codereview.qt.nokia.com/2426
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Rohan McGovern [Mon, 1 Aug 2011 23:13:38 +0000 (09:13 +1000)]
test: fixed crash of tst_qdialog and removed CONFIG+=insignificant_test
This test assumed that C++ exceptions could always be caught by the
event loop. This is not the case when the Glib event loop is used.
Skip the relevant portion of the test in that case.
Change-Id: I6a6325c3590c810a5aba28ec98279581dcfaf55c
Reviewed-on: http://codereview.qt.nokia.com/2455
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Rohan McGovern [Mon, 1 Aug 2011 23:24:25 +0000 (09:24 +1000)]
test: improved stability of tst_qiodevice on slow machines
Increased network timeout from 5 to 30 seconds.
Change-Id: I4751dbfbb82c2091f1cec26150f06f913ffbe4c0
Reviewed-on: http://codereview.qt.nokia.com/2456
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Rohan McGovern [Mon, 1 Aug 2011 23:44:09 +0000 (09:44 +1000)]
test: fixed tst_qimagereader and removed CONFIG+=insignificant_test
This test assumed that Qt's available image formats could be determined
at compile time. This was never correct since the image formats are
loaded from plugins at runtime; in Qt5 it became a real problem since
one image format (svg) was moved out of qtbase into a separate module,
turning this into a circular dependency: this test in qtbase depends on
qtsvg, which depends on qtbase.
Always check the image formats at runtime instead.
Change-Id: I5e770c5b11276c39910e34f232a2fea0a7abaa8c
Reviewed-on: http://codereview.qt.nokia.com/2457
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Rohan McGovern [Tue, 2 Aug 2011 00:22:08 +0000 (10:22 +1000)]
test: improved stability of tst_qwaitcondition
Increased thread wait timeout from 3 to 10 milliseconds, for slower or
heavily loaded machines. (There was a previous attempt to improve
stability of this test some time ago by increasing the timeout from 1
to 3 milliseconds.)
Note that this increases the runtime of the wakeOne test from ~5 to ~14
seconds.
Change-Id: Ib556d4c949a6989fe71c11f5dc10feb2ec45c512
Reviewed-on: http://codereview.qt.nokia.com/2458
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Rohan McGovern [Tue, 2 Aug 2011 04:52:25 +0000 (14:52 +1000)]
test: fixed tst_qmessagebox and removed CONFIG+=insignificant_test
Removed some binary compatibility tests written specifically to test a
change introduced between Qt 4.1 and 4.2. Qt 4 and 5 are not binary
compatible, the test no longer makes sense.
Change-Id: I3e8f9b6011105e504c20bedad51af8193b102552
Reviewed-on: http://codereview.qt.nokia.com/2464
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Rohan McGovern [Tue, 2 Aug 2011 01:12:47 +0000 (11:12 +1000)]
test: fixed spelling errors in tst_qtextscriptengine
couln't -> couldn't
Change-Id: I37e86ecea74db1114fcfac93423388fae81df63d
Reviewed-on: http://codereview.qt.nokia.com/2465
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Rohan McGovern [Tue, 2 Aug 2011 04:46:15 +0000 (14:46 +1000)]
test: replace CONFIG+=insignificant_test with QEXPECT_FAIL for tst_qftp
This autotest failure is entirely stable, so QEXPECT_FAIL should be used
instead of insignificant_test.
Task-number: QTBUG-20687
Change-Id: I0444e725b436fe93d30cbe54edc673594ca9b9fe
Reviewed-on: http://codereview.qt.nokia.com/2486
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Rohan McGovern [Mon, 1 Aug 2011 04:21:56 +0000 (14:21 +1000)]
test: fixed tst_qfilesystemmodel and removed insignificant_test
tst_qfilesystemmodel::sort uses some internal API to affect the sorting
behavior. This means that part of the test must be disabled when
private symbols aren't available.
Change-Id: I2e7b9d7a33cb3e7032bc5380c03fa29ecc84e12c
Reviewed-on: http://codereview.qt.nokia.com/2413
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Friedemann Kleint [Fri, 29 Jul 2011 11:47:23 +0000 (13:47 +0200)]
Bring back QPixmap::grabWidget() (with a warning).
Change-Id: I8bbf07da474bc3ab35980b25c41c2fc4c02e8896
Reviewed-on: http://codereview.qt.nokia.com/2394
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Rohan McGovern [Mon, 1 Aug 2011 00:17:51 +0000 (10:17 +1000)]
Fixed tst_qprocess, tst_qtcpserver when crashing is slow
These tests assumed that a crashing program will always exit within
five seconds. This is not true in some situations. On our test macs,
enabling crash dumps can easily cause a process to take longer than
five seconds to crash.
Increased the timeout to 30 seconds.
Change-Id: Ifca240ac8d3da1346f33110653ac47de6ba2ab81
Reviewed-on: http://codereview.qt.nokia.com/2407
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Olivier Goffart [Fri, 29 Jul 2011 08:44:30 +0000 (10:44 +0200)]
Fix tst_qgraphicsview::task255529_transformationAnchorMouseAndViewportMargins
If we do not process the event, q->underMouse may return false in
QGraphicsViewPrivate::centerView (as the QEvent::Enter has not been
received yet.)
It was working before if by luck, the window appears under the cursor.
Change-Id: I9b4497683eae20915680297013a9c21fd6275f4b
Reviewed-on: http://codereview.qt.nokia.com/2385
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Friedemann Kleint [Fri, 29 Jul 2011 14:33:10 +0000 (16:33 +0200)]
Compilation of tst_qwidget.cpp.
Change-Id: Id1af7f98e1ef615f31e3512b57d727eda8b91f1f
Reviewed-on: http://codereview.qt.nokia.com/2401
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Bradley T. Hughes [Fri, 29 Jul 2011 10:26:43 +0000 (12:26 +0200)]
Fix compilation with namespaced builds
Add QT_BEGIN_NAMESPACE and QT_END_NAMESPACE to src/corelib/tools/qfreelist.cpp
Change-Id: Ie01e74a3c2d9cd4de1f52a546d13398e1409c86b
Reviewed-on: http://codereview.qt.nokia.com/2390
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Jiang Jiang [Thu, 21 Jul 2011 13:09:24 +0000 (15:09 +0200)]
Switch to use floating point pixelSize in QRawFont completely
Reviewed-by: Eskil
(cherry picked from commit
500f8a4368be85a0ae8b7c46012deb0ab0c844ad)
Change-Id: I6cfebcbb68697c9bf7a5634e98a09a26928467d7
Reviewed-on: http://codereview.qt.nokia.com/2386
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Olivier Goffart [Tue, 26 Jul 2011 08:44:55 +0000 (10:44 +0200)]
Simplify the mutexpool used in QObject.
Since we now have QBasicMutex as a POD, we can simplify the mutexpool.
This remove the call the the Q_GLOBAL_STATIC and some others tests that
are taking CPU cycles when activating a signal.
The QMutexPool class itself can't be simplified because its mutex are
recursive mutexes, and the size is dynamic. also it is harder to get all
the mutexes initialized to 0.
Change-Id: Ie781655635907d2ad620eb189099cba14638414f
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/2171
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Olivier Goffart [Sat, 2 Jul 2011 13:13:12 +0000 (15:13 +0200)]
QMutex is now just a pointer
And added a POD QBasicMutex. (QBasicMutex* can safely be
static_cast'ed to QMutex*)
The d pointer is not anymore always a QMutexPrivate.
If d == 0x0: the mutex is unlocked
If d == 0x1: the mutex is locked, uncontended
On linux:
if d == 0x3: the mutex is locked contended, waiting on a futex
If d is a pointer, it is a recursive mutex.
On non-linux platforms:
When a thread tries to lock a mutex for which d == 0x1, it will try to
assing it a QMutexPrivated (allocated from a freelist) in order to wait
for it.
Change-Id: Ie1431cd9402a576fdd9a693cfd747166eebf5622
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/2116
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Friedemann Kleint [Fri, 29 Jul 2011 07:47:19 +0000 (09:47 +0200)]
Fix compilation of Minimalplugin, add documentation.
Change-Id: I3b40eed781905610cc3062d25dcccf5f760de1f0
Reviewed-on: http://codereview.qt.nokia.com/2382
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Jiang Jiang [Thu, 28 Jul 2011 12:51:54 +0000 (14:51 +0200)]
Fix off-by-one error in binary search
This one-line change makes the binary search in QTextEngine::findItem
behave consistently with the linear search that it replaced in commit
acf678e57ed088f3e56a551cac6c7c3322005750. The new behavior seems to
cause crashes in kword (and perhaps other applications) by triggering a
logClusters assert, although I have been unable to create a unit test
that reproduces this.
Task-number: QTBUG-17209
Done-by: Dr. Robert Marmorstein <robert@narnia.homeunix.com>
Change-Id: I68b79f024e9836e1cc8b0f3514889120541eb2ea
Reviewed-on: http://codereview.qt.nokia.com/2343
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>