summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Lighthouse: Wayland: Fix the readback for the glContext in the eglJørgen Lind2011-03-251-3/+30
| | | | backend
* Lighthouse: Wayland: Print out what platformbackend we are usingJørgen Lind2011-03-254-1/+8
|
* Prevent crash on exit by deleting QXcbWindow's GL context integration.Samuel Rødal2011-03-241-0/+1
|
* Lighthouse: Move glx common code into shared filesJørgen Lind2011-03-2413-392/+33
|
* Lighthouse: Wayland: Make QGLWidget work with the glx integrationJørgen Lind2011-03-241-4/+32
| | | | Still missing same code for egl integration
* Added missing -lX11 to xpixmap_glx wayland integration.Samuel Rødal2011-03-242-1/+2
|
* Lighthouse: Wayland. Added glx backend for gl integrationJørgen Lind2011-03-2415-10/+533
|
* Lighthouse: Wayland Fix naming bug in the glintegrationJørgen Lind2011-03-244-4/+4
|
* Don't say we support _NET_WM_PING when we don't (xcb platform).Samuel Rødal2011-03-241-1/+1
| | | | Fixes graying out of windows on Compiz.
* Lighthouse: Wayland: Added a xpixmap readback glcontextJørgen Lind2011-03-2319-11/+359
| | | | | | It uses a x11 pixmap to render all gl content into, then reads it back using glReadPixels. Then it sends it over the wire like any other shm surface.
* Lighthouse: Wayland: Move the frame throttling into the platform windowJørgen Lind2011-03-233-19/+24
| | | | This is only for the shm case
* Lighthouse: Wayland, implement gl_integrationJørgen Lind2011-03-2320-158/+224
|
* Avoid duplicate calls to eglGetDisplay() in XCB / Xlib platforms.Samuel Rødal2011-03-237-13/+22
| | | | | Just call eglGetDisplay() once, as we also need to call eglInitialize() before the display can be used validly.
* We need the xml libs for QML also for the simulator.con2011-03-221-0/+8
|
* Use the new QT_QPA_DEFAULT_PLATFORM_NAME define.con2011-03-221-13/+3
|
* Fix QT_NO_NETWORKPROXY.con2011-03-221-0/+4
| | | | Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* Lighthouse: Remove drm hack in pro fileJørgen Lind2011-03-221-5/+0
|
* Lighthouse: fixup from cherry-pickJørgen Lind2011-03-211-1/+0
| | | | a9b5cc1b3d6d5fb9569ad3bca9b5584b6415bfd6
* Compile fix for QPAPaul Olav Tvete2011-03-211-1/+2
|
* Lighthouse: compile fix for dri2 contextsJørgen Lind2011-03-211-1/+1
|
* Lighthouse: Make it possible to compile in default platform pluginJørgen Lind2011-03-181-3/+10
|
* Fixed compilation of QtOpenGL with Q_WS_QPA.Samuel Rødal2011-03-171-0/+4
|
* Fixes detected by the static-checkJørgen Lind2011-03-174-4/+86
| | | | | | 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
|
* Mac: add autorelease pools to create_sysMorten Sorvig2011-03-171-0/+4
| | | | Fixes a couple of on-startup leaks.
* 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-17350-1876/+8686
|\ | | | | | | | | Conflicts: mkspecs/qws/macx-nacl-g++/qplatformdefs.h
| * Merge remote-tracking branch 'integration/qt-master-from-4.7' into HEADThiago Macieira2011-03-162-5/+10
| |\
| | * QTcpSocket: Fix for disconnect in Unbuffered mode.Markus Goetz2011-03-162-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | We need to set the state properly after we have been disconnected. Also fix the HTTP layer, it needs to handle the disconnect when reading. Reviewed-by: Peter Hartmann
| | * Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-157-14/+101
| | |\ | | | | | | | | | | | | | | | | Conflicts: tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * | \ Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-1631-110/+1824
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-164-16/+179
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-163-15/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-qml into 4.7-integrationQt Continuous Integration System2011-03-161-3/+5
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Disabled non-QDeclarativeItems in Flickable break flicking
| | | * | | | Disabled non-QDeclarativeItems in Flickable break flickingMartin Jones2011-03-161-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow Flickable to steal grab from items that are disabled. Change-Id: I71e401cd78695ecb2c3d47abde1c3d13e722d848 Task-number: QT-4677 Reviewed-by: Michael Brasser
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-1515-19/+1484
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Hot fix for compilation without QGL_USE_TEXTURE_POOL Initial implementation of GLES2.0 resource pooling
| | | * | | | | Hot fix for compilation without QGL_USE_TEXTURE_POOLJani Hautakangas2011-03-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TRUSTME
| | | * | | | | Initial implementation of GLES2.0 resource poolingJani Hautakangas2011-03-1515-19/+1482
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep the implementation in separate qpixmapdata_poolgl.cpp file until the pooling has been verified and confirmed to work ok. Task-number: QTBUG-15253 QTBUG-17850 Reviewed-by: Samuel Rødal
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-151-22/+25
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Designer: Fix a bug affecting tab reordering of promoted tab widgets. Designer: Fix a bug clearing the Z-Order when adding a new widget. Adjust right bearing when breaking with line separators
| | | * | | | | Adjust right bearing when breaking with line separatorsJiang Jiang2011-03-151-22/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we found a forced line break with line separator (e.g. '\n'), take the right bearing of previous glyph into account, otherwise the resulting text width will be slightly smaller than the one without a line separator. Task-number: QTBUG-17020 Reviewed-by: Eskil
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-1511-43/+63
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | / | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2011-03-151-6/+8
| | | |\ \ \ \
| | | | * | | | Avoid panics in QDesktopWidget on Symbian emulator.Laszlo Agocs2011-03-151-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is usually only one screen on the emulator and it was incorrectly assumed that ScreenDevice() would return null for a non-existing screen. It panics instead so the entire call must be skipped. Reviewed-by: Sami Merila
| | | * | | | | QS60Style: use placeholder texture when polishing widgets and paletteSami Merila2011-03-153-7/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Background texture is not created until it is actually painted. This allows skipping the whole background texture creation, if app overwrites the QPalette::Window with its own data (image or color). When widget is drawn and style notices that the widget is still using a placeholder (1*1 red QPixmap) texture, it creates the real texture and uses that for drawing. Note that accessing QPalette::Window will give the placeholder pixmap. Which is then again replaced with the real texture, if it is drawn through the qt_s60_fill_background(). Task-number: QTBUG-14910 Reviewed-by: Laszlo Agocs
| | | * | | | | Regression: QS60Style: Theme background is incorrectSami Merila2011-03-151-0/+1
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for QTBUG-16816 cause theme background to display incorrectly after a layout switch is done. Theme background is shown "tiled" instead of being whole screen size. This is because the setBackgroundTexture() call was removed to "save" QPixmap creation. Unfortunately, it really skips the background texture creation, but does not re-create a new one for the new layout, so portrait background is used again. This leads to tiling the image. Let's just return the call to the setBackgroundTexture() (this will eventually anyway be "optimized" with fix for QTBUG-14910). Task-number: QTBUG-17930 Reviewed-by: Laszlo Agocs
| | | * | | | Remove changes from fix to QTBUG-17045 that were not related to the fixSami Merila2011-03-151-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were changes included in the fix for QTBUG-17045 that were not supposed to be part of that fix. These changes to qcombobox.cpp are now removed. Task-number: QTBUG-17045 Reviewed-by: TrustMe
| | | * | | | Prevent null pointer crash when closing splitviewSami Merila2011-03-152-17/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents crash when focus item is not set and splitview is closed. This is partial fix to QTBUG-17045. Task-number: QTBUG-17045 Reviewed-by: Guoqing Zhang
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2011-03-146-7/+19
| | | |\ \ \ \
| | | | * \ \ \ Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7axis2011-03-146-7/+19
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
generated by cgit v0.12 at 2025-01-10 04:17:07 (GMT)