summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Add Windows to the Lighthouse.Friedemann Kleint2011-08-1848-0/+15324
| | | | | | | | | 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>
* Enable multisampling and swap interval by default on cocoaGunnar Sletta2011-08-181-0/+4
| | | | | | | 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>
* Set the style mask manually.Morten Sorvig2011-08-181-2/+2
| | | | | | | | | | | 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>
* Fix crash-on-exit in qmlscene.Morten Sorvig2011-08-183-2/+17
| | | | | | | | | | 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>
* Create NSWindow subclass.Morten Sorvig2011-08-182-4/+27
| | | | | | | | | 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>
* Cocoa: Remove autorelease warnings from qmlscene.Morten Sorvig2011-08-181-0/+3
| | | | | | | | | | | 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>
* Don't set platform input context if it's not properly created.Samuel Rødal2011-08-162-4/+7
| | | | | | | | | | 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>
* Cocoa: Fix flicker on window resize.Morten Sorvig2011-08-161-2/+1
| | | | | | | | | | | | | | | 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>
* Cocoa: Set child window geometry correctly.Morten Sorvig2011-08-112-15/+58
| | | | | | | | | | | 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>
* Cocoa: Activate Qt apps on startup.Morten Sorvig2011-08-111-0/+6
| | | | | | | | | | | | | | 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>
* Don't try to use IBUS when dbus is not configured.Samuel Rødal2011-08-102-1/+5
| | | | | | | 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>
* Removed unnecessary debug output in xcb plugin.Samuel Rødal2011-08-102-6/+0
| | | | | | | 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>
* Made QWindow::setVisible() send show and hide events.Samuel Rødal2011-08-102-12/+0
| | | | | | | 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>
* build without dbusMatthew Cattell2011-08-091-0/+2
| | | | | | | 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>
* Removed Q_XCB_NOOP's from QGLXContext.Samuel Rødal2011-08-091-13/+1
| | | | | | | | | | 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>
* Get linux input plugin compiling by removing keyboard supportGunnar Sletta2011-08-094-227/+1
| | | | | | | 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>
* make eglfs compileGunnar Sletta2011-08-083-3/+3
| | | | | | | 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>
* Implement map/unmap and force geometry EglFSGunnar Sletta2011-08-082-1/+18
| | | | | | | 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>
* Properly initialize window properties in xcb plugin.Samuel Rødal2011-08-051-2/+3
| | | | | | | | | 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>
* Get wayland plugin working after latest QPA API changes.Samuel Rødal2011-08-052-11/+7
| | | | | | | 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>
* Get rid of missing qmake warning.Samuel Rødal2011-08-051-2/+0
| | | | | | | 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>
* Undefine "slots" before including cocoa headers to make it compileGunnar Sletta2011-08-052-0/+2
| | | | | | | 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>
* Merge "Merge remote branch 'gerrit/master' into refactor" into refactorJørgen Lind2011-08-041-3/+3
|\
| * Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-08-031-3/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Changed QLibrary::resolve() to return a function pointer.Kim Motoyoshi Kalland2011-07-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the C++ standard, there is no guarantee that you can cast between function pointers and void pointers without data loss (section 5.2.10-6). Change-Id: I27f4d835e4c8ca8ecca0d76cfea9ce34491956bd Reviewed-on: http://codereview.qt.nokia.com/1995 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* | | Initial support for Qt using Kernel Mode-setting (KMS)Andy Nichols2011-08-0418-0/+1864
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Mac: fix crash when creating a new windowRichard Moe Gustavsen2011-08-031-3/+1
|/ / | | | | | | | | | | | | 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>
* | Fix compilation of Minimalplugin, add documentation.Friedemann Kleint2011-07-292-8/+16
| | | | | | | | | | | | | | 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>
* | Make QPlatformIntegration not have a factory for eventdispatcherJørgen Lind2011-07-2813-52/+49
| | | | | | | | | | | | | | | | | | but rather an accessor for the guiThreadEventDispatcher Change-Id: I1b9ba14efc9f338c5a67e3e24ddb0caf76c07413 Reviewed-on: http://codereview.qt.nokia.com/2321 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Initial OpenWFD supportJørgen Lind2011-07-2724-0/+2344
| | | | | | | | | | | | | | Change-Id: I06f71073ec58af1a431edb997f3a359800320196 Reviewed-on: http://codereview.qt.nokia.com/2288 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Get the eglfs plugin compiling.Samuel Rødal2011-07-269-97/+86
| | | | | | | | | | | | | | Change-Id: I5addb1a2593a670d559b9fbf9183f52af410895b Reviewed-on: http://codereview.qt.nokia.com/2176 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* | Drag and drop support in Wayland plug-in.Laszlo Agocs2011-07-257-2/+525
| | | | | | | | | | | | | | Change-Id: I5e4448a9b3d3df9e3a12733386079031be340a42 Reviewed-on: http://codereview.qt.nokia.com/2101 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Pixmap cursor support in QWaylandCursor.Laszlo Agocs2011-07-252-15/+64
| | | | | | | | | | | | | | Change-Id: I7075229584e9705fae63679b5512c11fd8535797 Reviewed-on: http://codereview.qt.nokia.com/2100 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Added workable QScreen API on top of QPlatformScreen.Samuel Rødal2011-07-2518-236/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPlatformIntegration::screens() no longer has to be implemented, implementations should call QPlatformIntegration::screenAdded() for each screen instead. This is for being able to support adding screens at run-time later on, by connecting it to a signal in QGuiApplication. The QGuiGLContext API has changed a bit, by not sending in all the parameters in the constructor but instead having a create() function. The createPlatformGLContext() factory in QPlatformIntegration takes a QGuiGLContext * instead of a QSurfaceFormat and a share context, similar to how the window and backing store factory functions work. The XCB plugin has experimental support for connecting to multiple X displays simultaneously, creating one or more QScreen for each. Change-Id: I248a22a4fd3481280710110272c04a30a8021e8f Reviewed-on: http://codereview.qt.nokia.com/2103 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* | Handle failed SHM attach in XCB backing store.Samuel Rødal2011-07-211-15/+39
| | | | | | | | | | | | | | Change-Id: I5f97c0c6030d13b68cfc17d19ba969cd78f79c3f Reviewed-on: http://codereview.qt.nokia.com/1943 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* | Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-07-217-28/+64
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/opengl/cube/main.cpp examples/widgets/applicationicon/main.cpp examples/widgets/orientation/main.cpp src/gui/image/qicon.cpp src/gui/image/qimage.h src/gui/image/qpixmap.h src/gui/image/qpixmap_mac.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qpalette.cpp src/gui/kernel/qwidget.cpp src/gui/styles/qmacstyle_mac.mm src/gui/widgets/qmenubar.cpp src/gui/widgets/qslider.cpp src/opengl/qwindowsurface_gl.cpp tests/auto/qvariant/qvariant.pro tests/benchmarks/corelib/kernel/qobject/qobject.pro tests/benchmarks/gui/animation/qanimation/qanimation.pro tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro tests/benchmarks/gui/image/qimagereader/qimagereader.pro tests/benchmarks/gui/itemviews/qtableview/qtableview.pro tests/benchmarks/gui/kernel/qapplication/qapplication.pro tests/benchmarks/gui/kernel/qwidget/qwidget.pro tests/benchmarks/gui/painting/qpainter/qpainter.pro tests/benchmarks/gui/painting/qtbench/qtbench.pro tests/benchmarks/gui/painting/qtracebench/qtracebench.pro tests/benchmarks/gui/text/qtext/qtext.pro Change-Id: I4b911c795ecb29d73b6a7fd18819711b49478a30
| * Fixed build of generic linuxinput plugin.Samuel Rødal2011-07-201-0/+2
| | | | | | | | | | | | | | Change-Id: I2289e369c831bfee9646ffe5c587647443548804 Reviewed-on: http://codereview.qt.nokia.com/1870 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
| * Implement todos in touchscreen generic plug-in.Laszlo Agocs2011-07-196-28/+62
| | | | | | | | | | | | | | | | | | | | | | | | The patch implements periodic clearing of the point states when no activity occurs (i.e. no ev_syn is coming at all, meaning that most probably all the fingers are already up) and also moves the entire functionality into a separate thread even when used as a plug-in. Change-Id: Ib1daa738085b61af9b07eb8a284416e5a3fcabe8 Reviewed-on: http://codereview.qt.nokia.com/1744 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* | Rename QPixmapData to QPlatformPixmap.Samuel Rødal2011-07-1933-61/+61
| | | | | | | | | | | | | | | | | | Makes the API symmetric with the other Lighthouse APIs. Change-Id: I8a399f3c968ea35d4624711b31f2ac5bb94b7893 Reviewed-on: http://codereview.qt.nokia.com/1735 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* | Get rid of some obsolete functions in QImage / QPixmap / QPixmapData.Samuel Rødal2011-07-181-1/+0
| | | | | | | | | | | | | | | | Change-Id: I0d2412c9196475b926a17de9fcc3281f6625fae0 Reviewed-on: http://codereview.qt.nokia.com/1733 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* | Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-07-125-17/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/image/qicon.cpp src/gui/image/qicon.h src/gui/image/qicon_p.h src/gui/text/qfontdatabase.cpp src/plugins/platforms/wayland/gl_integration/qwaylandglwindowsurface.cpp src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp sync.profile Change-Id: Ie0a23a12177ff51bf562e15b2dd41f071afb19b4
| * Remove more references to demos.Casper van Donderen2011-07-081-2/+2
| | | | | | | | | | | | | | Change-Id: I431184cd0534c86047706fdaa1045b2935de5d7a Reviewed-on: http://codereview.qt.nokia.com/1307 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Boddie
| * Fixed wayland windowmanager-protocol authorizationMartin Zielinski2011-07-083-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The authorization is now handled more robust. The client tries to authenticate as soon as a surface is created, but does so only if the authentication token is valid. A re-authorization than happens when requestActivateWindow() is called. This is needed to get the auth-process properly working even with pre-started clients, that do not have a valid token on surface-creation time. Change-Id: I4371b424686b9d5a6a163a802ec66a33c0aeeea7 Reviewed-on: http://codereview.qt.nokia.com/1207 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lasse Holmstedt
| * Don't keep a static instance of QDBusConnectionHarald Fernengel2011-07-071-10/+8
| | | | | | | | | | | | | | | | | | | | Prevents weird crashes at app exit and makes backtraces from potential crashes saner because they won't start in __cxa_init. Change-Id: I62821faad03b06ec92da05d96027b668d1f1ca0f Reviewed-on: http://codereview.qt.nokia.com/1324 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Robert Griebl <robert.griebl@nokia.com>
| * We need to let the currentContext be in the same state afterJørgen Lind2011-07-061-1/+8
| | | | | | | | | | | | | | | | | | | | setting the new eglsurface (cherry picked from commit af3efefeefe686e5c35ed502de077c0bcb6f6fc0) Change-Id: Ic1d62b21a1482d1bc7f1d99478e175e4b767e157 Reviewed-on: http://codereview.qt.nokia.com/1209 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
| * Fix the wayland windowsurface so that we have stencil and depth bufferJørgen Lind2011-07-061-1/+1
| | | | | | | | | | | | | | | | | | (cherry picked from commit 322c96eb9564f930a63be820c22b053630663880) Change-Id: I89c10cea1a302d9549024940e49c7d5960abb953 Reviewed-on: http://codereview.qt.nokia.com/1210 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* | Fix minimal plugin for windowsOlli Werwolff2011-07-071-0/+8
| | | | | | | | | | | | | | Change-Id: Ica017cdad4c8205706b42767035d834498b63037 Reviewed-on: http://codereview.qt.nokia.com/1268 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Merge branch 'refactor' of scm.dev.nokia.troll.no:qt/qtbase-staging into ↵Lars Knoll2011-07-061-2/+2
|\ \ | | | | | | | | | refactor
| * | Fixed gl_integration.pri on non-mac platforms.Samuel Rødal2011-07-061-2/+2
| | |
* | | Merge remote branch 'gerrit/master' into refactorLars Knoll2011-07-0617-52/+1033
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/opengldesktop/opengldesktop.cpp examples/itemviews/interview/interview.pro examples/mainwindows/mainwindow/mainwindow.pro examples/openvg/README examples/richtext/textedit/textedit.pro examples/tools/undo/undo.pro src/corelib/global/qglobal.h src/corelib/kernel/qcoreapplication.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qmetatype.h src/gui/kernel/qevent.cpp src/gui/kernel/qevent.h src/gui/painting/qpaintengine_raster.cpp src/gui/painting/qpaintengine_raster_p.h src/gui/text/qfontdatabase.cpp src/opengl/qgl.h src/openvg/qpaintengine_vg.cpp src/plugins/platforms/wayland/qwaylandwindow.cpp tests/auto/qmainwindow/qmainwindow.pro Change-Id: I6bfb586740a68379bb99f4612ec993393a5f3234
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 22:01:28 +0000