summaryrefslogtreecommitdiffstats
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-182-0/+7
| | | | | | | 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>
* Readded (and fixed) WindowsXP and -Vista stylesOlli Werwolff2011-08-174-16/+58
| | | | | | | | | | 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>
* compile after removal of OpenGL 1 paint engineGunnar Sletta2011-08-173-14/+2
| | | | | | | 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>
* Build fix after setPreferredPaintEngine was removedPaul Olav Tvete2011-08-172-5/+0
| | | | | | | 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>
* Make configure work again..Gunnar Sletta2011-08-171-0/+1
| | | | | | | 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>
* Get rid of OpenGL 1.x engine and platform code from QtOpenGL.Samuel Rødal2011-08-1646-16425/+66
| | | | | | | 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>
* Don't set platform input context if it's not properly created.Samuel Rødal2011-08-164-4/+14
| | | | | | | | | | 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>
* Get rid of unused convenience class in QtOpenGL.Samuel Rødal2011-08-163-76/+0
| | | | | | | | | | 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>
* Cocoa: Fix flicker on window resize.Morten Sorvig2011-08-163-2/+7
| | | | | | | | | | | | | | | 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>
* Disable WindowsXP/-Vista styles for nowOlli Werwolff2011-08-151-0/+1
| | | | | | | | | | 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>
* Fix typo in qapplication testOlli Werwolff2011-08-151-1/+1
| | | | | | | 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>
* Fixed compilation of qfiledialog_win.cppOlli Werwolff2011-08-151-1/+14
| | | | | | | 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>
* Fix platformsupport as installable moduleJørgen Lind2011-08-112-2/+5
| | | | | | | 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
* 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>
* Configure: Make QPA default when building on OS XMorten Sorvig2011-08-111-3/+1
| | | | | | | | | | | | 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>
* 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>
* include .cc and .CC in fix headers scriptGunnar Sletta2011-08-111-1/+1
| | | | | | | 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>
* Implement "quit on last window closed" logic for QWindowGunnar Sletta2011-08-115-2/+88
| | | | | | | 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>
* 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-103-14/+19
| | | | | | | 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>
* Removed QPaintDevice dependency in blitFramebuffer().Samuel Rødal2011-08-093-2/+21
| | | | | | | 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>
* 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-053-11/+8
| | | | | | | 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>
* Added some convenience to QWindowGunnar Sletta2011-08-052-0/+26
| | | | | | | 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>
* Add WindowStateChanged event.Friedemann Kleint2011-08-057-5/+52
| | | | | | | | | 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>
* 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>
* Fix wayland config testJørgen Lind2011-08-041-1/+1
| | | | | | | 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>
* compile fix for compiling without sslJørgen Lind2011-08-041-4/+8
| | | | | | | 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>
* Merge "Merge remote branch 'gerrit/master' into refactor" into refactorJørgen Lind2011-08-04133-1256/+2914
|\
| * Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-08-03133-1256/+2914
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Fix QString/QByteArray literals for MSVC2010 (compilation of tests).Friedemann Kleint2011-08-023-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
| | * test: mark tst_qtconcurrentfilter as insignificant on LinuxRohan McGovern2011-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * test: mark tst_qabstractnetworkcache as insignificantRohan McGovern2011-08-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Make failure messages from tst_QSslCertificate::verify much more usefulRohan McGovern2011-08-021-9/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Eliminate reference to Trolltech.Jason McDonald2011-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * test: skip some tst_qtextscriptengine tests when fonts are missingRohan McGovern2011-08-022-5/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Introduced a CONFIG option that enables declarative debug servicesThorbjørn Lindeijer2011-08-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * test: remove CONFIG+=insignificant_test for tst_qgraphicstransformRohan McGovern2011-08-022-8/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>