summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master'Olivier Goffart2011-03-21946-4872/+33533
|\
| * Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-03-196-26/+234
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-186-26/+234
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-173-5/+76
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | | * Changes to driver workarounds.Robin Burchell2011-03-171-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Force enable brokenFBOReadBack on non-Nokia v1.4 SGX drivers (as this is apparantly not fixed, except on the Nokia drivers) - Add debug when workarounds are enabled to ease debugging This fixes the following MeeGo bug: https://bugs.meego.com/show_bug.cgi?id=5616 Merge-request: 1144 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | | | * 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
| | | | * Clipboard/Windows: Fix a hang when sending to non-responsive clients.Friedemann Kleint2011-03-171-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if clipboard viewer is responsive before sending the contents. This prevents Qt Creator from hanging when copying text while a debugging session with a crashed/stopped debuggee is in progress. Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com> Task-number: QTBUG-17465
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-173-21/+158
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix accidental population of the disk cache with partial content Fix disk cache interaction for range retrieval HTTP requests.
| | | | * | Fix accidental population of the disk cache with partial contentSimon Hausmann2011-03-172-0/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the disk cache does not support partial content, we should not try to store it in the cache altogether. Done-with: Jocelyn Turcotte Reviewed-by: Markus Goetz Reviewed-by: Peter Hartmann
| | | | * | Fix disk cache interaction for range retrieval HTTP requests.Simon Hausmann2011-03-172-21/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The disk cache API does not currently support retrieving partial content, it can only serve entire files. Therefore we disable the use of the cache for these kinds of requests, as indicated by the presence of the Range header field. Done-with: Jocelyn Turcotte Reviewed-by: Markus Goetz Reviewed-by: Peter Hartmann
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵Qt Continuous Integration System2011-03-182-4/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: qmake vcproj generator: do not insert $(INHERIT)
| | * | | | | qmake vcproj generator: do not insert $(INHERIT)Joerg Bornemann2011-03-182-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will remove the warnings about undefined environment variables when building with IncrediBuild. The $(INHERIT) feature does not work in the "Create PCH through file" property of Visual Studio. It expands to an empty string but doesn't yield a warning in a standard VS build. Also, the value of "Create PCH through file" is supposed to be exactly the string as in the include statement of the cpp file. Done-with: Marius Storm-Olsen
| * | | | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse ↵Qt Continuous Integration System2011-03-18197-1566/+9267
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: (101 commits) Fixes detected by the static-check Fixup license headers in Lighthouse plugins Mac: add autorelease pools to create_sys Don't skip remaining events on unhandled events in xcb backend. Lighthouse: Xcb, compile fix for the glx path Lighthouse: Make sure we don't use xkbcommon Lighthouse: Add pkg-config check for opengl es2 Rename qnaclunimplemented -> qfunctions_nacl Rename qconfig-minimal-system-depenencies.h Add QT_NO_FILESYSTEMITERATOR. Add QT_NO_DYNAMIC_LIBRARY. Compile. NaCl: Dont force release builds. NaCl: disable libtiff. posix platformdefs: Add QT_NO_SOCKET_H. qpnghandler: Compile with QT_NO_IMAGE_TEXT. Lighthouse: Support Q_NO_CLIPBOARD. Compile. Fix CoreServices framework addition for qpa. Update NaCl mkspecs. ...
| | * | | | | | 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-17730-6261/+24045
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/qws/macx-nacl-g++/qplatformdefs.h
| | * | | | | | | Lighthouse: Xcb, compile fix for the glx pathJørgen Lind2011-03-161-0/+2
| | | | | | | | |
| | * | | | | | | Lighthouse: Make sure we don't use xkbcommonJørgen Lind2011-03-162-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when we don't have it
| | * | | | | | | Lighthouse: Add pkg-config check for opengl es2Jørgen Lind2011-03-161-1/+10
| | | | | | | | |
| | * | | | | | | Rename qnaclunimplemented -> qfunctions_naclMorten Sorvig2011-03-168-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | (Match the existing files for wince and vxworks.)
| | * | | | | | | Rename qconfig-minimal-system-depenencies.hMorten Sorvig2011-03-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename to qconfig.nacl.h. This reflects that the config now enables all dependencies NaCl can support, not necessarily the minimal set.
| | * | | | | | | Add QT_NO_FILESYSTEMITERATOR.Morten Johan Sørvig2011-03-165-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to use the file-related classes on platforms that does not have a native QFileSystemIterator implementation. One use case is that we want to use the Qt resource system even if the platform file system support is limited. Reviewed-by: joao
| | * | | | | | | Add QT_NO_DYNAMIC_LIBRARY.Morten Johan Sørvig2011-03-161-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set it for nacl, replace the Q_OS defines vxworks already has in place. Motivation: Support static plugins on platforms that does not support dynamic plugins. Static plugin support is implemented in QPluginLoader, which has a QLibraryPrivate d pointer. The easiest way to untangle this seems to be to compile in QLibrary and then disable the ports of it that uses dlopen. Reviewed-By: Harald Fernengel
| | * | | | | | | Compile.Morten Johan Sørvig2011-03-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Respect the system-zlib QT_CONFIG setting. Reviewed-by: Jørgen Lind
| | * | | | | | | NaCl: Dont force release builds.Morten Johan Sørvig2011-03-161-2/+0
| | | | | | | | |
| | * | | | | | | NaCl: disable libtiff. Morten Johan Sørvig2011-03-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | (libtiff doesn't compile)
| | * | | | | | | posix platformdefs: Add QT_NO_SOCKET_H.Morten Johan Sørvig2011-03-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents including <sys/socket.h> Reviewed-by: Jørgen Lind
| | * | | | | | | qpnghandler: Compile with QT_NO_IMAGE_TEXT.Morten Johan Sørvig2011-03-161-0/+2
| | | | | | | | |
| | * | | | | | | Lighthouse: Support Q_NO_CLIPBOARD.Morten Johan Sørvig2011-03-164-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Jørgen Lind
| | * | | | | | | Compile.Morten Johan Sørvig2011-03-161-0/+2
| | | | | | | | |
| | * | | | | | | Fix CoreServices framework addition for qpa.Morten Johan Sørvig2011-03-161-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test against the coreservices QT_CONFIG on qpa, unconditionally add CoreFoundation for mac and darwin
| | * | | | | | | Update NaCl mkspecs.Morten Johan Sørvig2011-03-164-407/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Less duplication, use the common unix and gcc conf files.
| | * | | | | | | 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-116-33/+46
| | | | | | | | |
| | * | | | | | | XmlPatterns actually compiles and runs.con2011-03-101-2/+2
| | | | | | | | |
| | * | | | | | | Fix http in combination with QT_NO_NETWORKPROXY.con2011-03-103-3/+8
| | | | | | | | |
| | * | | | | | | Add proof-of-concept UIKit based lighthouse platform.con2011-03-1027-0/+2401
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See the README in the uikit platform plugin for details.
| | * | | | | | | Build QProcess on platforms that don't have _NSGetEnvironcon2011-03-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Jørgen Lind
| | * | | | | | | Build JavaScriptCore also under unusual platform combination.con2011-03-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Jedrzej Nowacki Reviewed-by: Simon Hausmann
| | * | | | | | | Objective-c prf may not override OBJECTIVE_CFLAGS settings.con2011-03-102-13/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Morten Johan Sørvig
| | * | | | | | | 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)
| | * | | | | | | Fix 7ea1dd46966ae7cfa07fa18c001704e3c981b669 for Mac desktop builds.con2011-03-071-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cocoa.h can't be included after qscroller_p.h, but we need to have Q_WS_MAC defined before the ifdef. Reviewed-by: Morten Johan Sørvig
| | * | | | | | | Inconsistency between ini case sensitivity between OS_MAC and WS_QPA.con2011-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPA sets CaseSensitive unconditionally, so if OS_MAC tries to use CaseInsensitive QSettings will assert. The patch leaves the non-QPA case unchanged.
| | * | | | | | | Do not explicitly process events before running event loop integration.con2011-03-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Processing posted Qt events before the event loop integration is started may lead to the process being killed for taking too long time before the native event loop is running. Since event loop integrations are required to install a timer that does processEvents anyhow, the Qt events will be processed even without doing it explicitly in advance.
| | * | | | | | | don't print debug outputcon2011-03-041-1/+1
| | | | | | | | |
| | * | | | | | | 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: Add xkbcommon to pkg-config configuration of waylandJørgen Lind2011-03-031-4/+4
| | | | | | | | |
generated by cgit v0.12 at 2025-02-01 20:41:33 (GMT)