summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-03-191-1/+38
|\ | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Changes to driver workarounds. Switch to raster also when last window is destroyed (on MeeGo). Fix accidental population of the disk cache with partial content Fix disk cache interaction for range retrieval HTTP requests. Clipboard/Windows: Fix a hang when sending to non-responsive clients.
| * Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-181-1/+38
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-171-1/+38
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Changes to driver workarounds. Switch to raster also when last window is destroyed (on MeeGo). Clipboard/Windows: Fix a hang when sending to non-responsive clients.
| | | * Switch to raster also when last window is destroyed (on MeeGo).Samuel Rødal2011-03-171-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This will save GPU resources for applications that are in the background for most of the time and only show a window now and then. Reviewed-by: Armin Berres
* | | | Fixes detected by the static-checkJørgen Lind2011-03-173-3/+85
| | | | | | | | | | | | | | | | | | | | | | | | This included added a license header on a moc file. Its nasty, but has to stay like that until we have a better sollution for generating moc files on uikit
* | | | Fixup license headers in Lighthouse pluginsJørgen Lind2011-03-17101-113/+441
| | | |
* | | | Don't skip remaining events on unhandled events in xcb backend.Samuel Rødal2011-03-171-2/+6
| | | |
* | | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-1768-88/+292
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: mkspecs/qws/macx-nacl-g++/qplatformdefs.h
| * | | Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-163-15/+175
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/symbian-gcce/qmake.conf qmake/generators/metamakefile.cpp qmake/generators/win32/mingw_make.cpp src/corelib/global/global.pri src/corelib/global/qglobal.h src/opengl/qgl.cpp src/opengl/qwindowsurface_gl.cpp src/plugins/platforms/wayland/qwaylandbuffer.h tests/auto/qnetworkreply/tst_qnetworkreply.cpp tools/designer/src/components/formeditor/qdesigner_resource.cpp
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-163-15/+175
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QMeeGoLivePixmapData : when creating QImage, use constructor with pitch. Added automatic graphicssystem switching on meego when app is minimized.
| | | * QMeeGoLivePixmapData : when creating QImage, use constructor with pitch.Tapani Pälli2011-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the data may be aligned/padded by the X driver. Fixes: NB#231246 : Incorrect stride used when QMeeGoLivePixmap width not multiple of eight Merge-request: 1115 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | | * Added automatic graphicssystem switching on meego when app is minimized.Samuel Rødal2011-03-162-14/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When all top-level widgets are minimized we switch to raster to reduce GPU memory consumption. We switch back to graphicssystem meego when at least one top-level widget is shown normally again. The switching only applies when the runtime graphicssystem is being used. The switching only applies when the runtime graphicssystem is being used. Task-number: QTBUG-18013 Reviewed-by: Armin Berres
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-151-2/+14
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (46 commits) Fix the license info for bin/elf2e32_qtwrapper.pl. Avoid panics in QDesktopWidget on Symbian emulator. QS60Style: use placeholder texture when polishing widgets and palette Regression: QS60Style: Theme background is incorrect Remove changes from fix to QTBUG-17045 that were not related to the fix Prevent null pointer crash when closing splitview QS60Style slows down layout switch by updating widgets unnecessarily Fix qgraphicstransform autotest for Symbian, where qreal is float. Removed reference to nonexistant profile. Disable capabilities example for symbian-gcce due to a bug in elf2e32 Readded a ';;' that was removed by mistake. Fixed mkspec detection for Symbian. Removed javascript-jit from default symbian-gcce build. Corrected a mismerge in GCCE link parameters. Fixed incorrect referral to an include file. Fixed win32-msvc2008 build regression. Made qmake strip trailing \ from libdirs. Fixed GCCE libdir handling if the paths have spaces in them. Added MinGW support for adding lib prefix and extension via profile. Added support for various special compiler/linker flags on MinGW. ...
| | | * \ Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7axis2011-03-141-2/+14
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| | | | * | Fixed a build library deployment issue in sqlite.axis2011-03-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make did not understand that sqlite3.dso, which the link relies on, is the same as $$OBJECTS_DIR/sqlite3.dso, which is extracted by the profile. RevBy: Trust me
| | | | * | Changed various qmake constructs to support Windows.axis2011-02-181-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Thomas Zander Conflicts: mkspecs/features/symbian/symbian_building.prf
| * | | | | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7Thiago Macieira2011-03-1161-61/+61
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/eabi/QtOpenVGu.def
| | * | | | | Update copyright year to 2011.Rohan McGovern2011-03-1061-61/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me (cherry picked from commit 774a3536b00c4d6e4c4c10b708e31b4373a338e3)
| * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-111-5/+7
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-101-5/+7
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix for major regression in OpenVG clipping Cast int to HALData::TAttribute for QT_HALData_ENumCpus and compile with RVCT4. Don't use EGL surfaces for translucency with 32MB GPU chip. Fix for fromSymbianCFbsBitmap changing the source data unexpectedly. Background app visible after split view closed Get the number of cores from HAL on Symbian. Avoid image conversion in fromSymbianCFbsBitmap for certain formats. Polish splitview implementation QML app: text input field is not visible when split view is opened Visible flashing on QML app when split view is opened and closed
| | | * | | Don't use EGL surfaces for translucency with 32MB GPU chip.Jani Hautakangas2011-03-101-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add dynamic GPU chip detection on Symbian to decide if translucent EGL surfaces can be used. With 32MB GPU memory there is not enough memory to create for example transparent video overlay widgets and that's why hw surfaces must not be used. Task-number: QTBUG-18024 Reviewed-by: Jason Barron
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-101-1/+1
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Bump Qt version to 4.7.3
| | | * | | Bump Qt version to 4.7.3Timo Turunen2011-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-091-6/+6
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-081-6/+6
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix possible bearer management Crash with Panic E32USER-CBase, 69 QNetworkCookie: fix quoted values Fix for QTBUG-17746. Quotes is retained in cookie value Unsuccessful unlocking of QNetworkConfigurationPrivate mutex
| | | * | | Fix possible bearer management Crash with Panic E32USER-CBase, 69Cristiano di Flora2011-03-081-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-Number: QT-4652 Reviewed-by: Xizhi Zhu
| | | * | | Unsuccessful unlocking of QNetworkConfigurationPrivate mutexPerttu Pohjonen2011-03-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Above mentioned mutex is locked twice: first in caller function and second time in called function. Called function unlocks mutex and emits signal clearly unaware that the mutex is actually still locked. I changed the mutex to be unlocked before the function is called. Task-number: QTBUG-15108 Reviewed-by: Ville Pernu
| * | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-084-0/+34
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-074-0/+34
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Invalidate the EGL surface of QMeeGoLivePixmapData when switching to Raster
| | | * | | Invalidate the EGL surface of QMeeGoLivePixmapData when switching to RasterPauli Nieminen2011-03-074-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMeeGoLivePixmap fails to lock the EGL surface and texture after switch to raster graphics system. The EGL surface is invalid after eglTerminate call in switch. But QMeeGoLivePixmapData doesn't know about the switch. Marking EGL surfaces and texture invalid after switch makes live pixmap automatically recreate the surface when next time requiring live pixmap. Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com> Merge-request: 2571 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-041-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-041-1/+1
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Added image conversion flag to prevent conversions.
| | | * | | Added image conversion flag to prevent conversions.Samuel Rødal2011-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed in the meego graphics system to support the shared image fallback path (when using the raster graphicssystem). The flag is internal. Reviewed-by: Gunnar Sletta
| * | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-032-0/+8
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/openvg/qvg_symbian.cpp src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-03-0115-143/+391
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| | * | | | Add internal function for releasing cached GPU resources.Jani Hautakangas2011-03-012-0/+8
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | Task-number: QTBUG-17849 Reviewed-by: Samuel Rødal
* | | | | Lighthouse: Xcb, compile fix for the glx pathJørgen Lind2011-03-161-0/+2
| | | | |
* | | | | Compile.Morten Johan Sørvig2011-03-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Respect the system-zlib QT_CONFIG setting. Reviewed-by: Jørgen Lind
* | | | | Properly set the window event masks etc for screens and GL windows too.Samuel Rødal2011-03-152-3/+5
| | | | |
* | | | | Fix race condition in the non-GL casePaul Olav Tvete2011-03-143-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure to also flush output when waiting for an ack from the compositor, in case we haven't sent the frame request yet. Reviewed-by: Jørgen
* | | | | Do release build for devices and remove some warnings.con2011-03-114-31/+42
| | | | |
* | | | | XmlPatterns actually compiles and runs.con2011-03-101-2/+2
| | | | |
* | | | | Add proof-of-concept UIKit based lighthouse platform.con2011-03-1021-0/+2082
| | | | | | | | | | | | | | | | | | | | See the README in the uikit platform plugin for details.
* | | | | Lighthouse: Adding Native interface to getting the native eglcontextJørgen Lind2011-03-079-17/+85
| | | | | | | | | | | | | | | | | | | | | | | | | in xcbplugin. I also reoredered how eglInitialize was executed, (its not so lazy anymore)
* | | | | Lighthouse: Fix a block for wayland with gl supportBenjamin Franzke2011-03-041-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The initialial readable iteration, needs to be done before initializing egl, or it will be done inside egl. The readable iteration after initialzing egl would block forever otherwise.
* | | | | Lighthouse: Make xcb backen usable for anyone else againJørgen Lind2011-03-031-1/+4
| | | | |
* | | | | Compile with glxPaul Olav Tvete2011-03-022-15/+16
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Jørgen
* | | | | Build fixes for the Wayland pluginPaul Olav Tvete2011-03-023-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add qmake.conf variables, and use the generic font plugin. Reviewed-by: Jørgen
* | | | | Lighthouse: Implement the new Native Interface api in the xcb pluginJørgen Lind2011-03-014-16/+87
| | | | |
* | | | | added capabilites to QPlatformIntegrationGunnar Sletta2011-03-0114-3/+72
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Jørgen Lind
generated by cgit v0.12 at 2025-01-04 02:07:01 (GMT)