summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Wayland: put context & drawing objects into the drm surfaceJesse Barnes2011-01-253-28/+27
| | | | | | | Even GL widgets will allocate window surfaces, so share everything there. This still leaves a hole when we mix GL widgets and the raster back end (the created platform GL context won't have a DRM buffer to use for its objects & context), but that won't work right now anyway...
* Wayland: add partial GL widget supportJesse Barnes2011-01-254-46/+56
| | | | | GL widgets need a platform GL context. Add one to get hellogl_es2 limping along.
* Wayland: add waylandgl platform typeJesse Barnes2011-01-251-0/+3
| | | | This will set mUseOpenGL when -platform waylandgl is passed to clients.
* Wayland: silence unused variable warnings in qwaylandinputdevice.cppJesse Barnes2011-01-251-0/+7
|
* Wayland: add GL drawing supportJesse Barnes2011-01-254-32/+167
| | | | | Works with analogclock, draws upside down, fails to resize, and doesn't show GL widget with hello_es2.
* Wayland: misc cleanupsJesse Barnes2011-01-252-2/+12
| | | | Unused variables, debug output.
* Introduce drm wayland bufferKristian Høgsberg2011-01-254-40/+151
|
* Initialize EGLKristian Høgsberg2011-01-253-31/+142
|
* Cursors, keyboard support, move/resizeKristian Høgsberg2011-01-257-87/+426
|
* Use QImage::Format_ARGB32_Premultiplied for the surfaceKristian Høgsberg2011-01-251-1/+1
|
* wayland: Track the QWaylandWindow in the input device instead of the surfaceKristian Høgsberg2011-01-251-12/+17
| | | | | The surface is destroyed when the window is hidden, so we can't use that for looking up the widget to send events to.
* wayland: Assign a window id to wayland windowsKristian Høgsberg2011-01-252-0/+10
|
* wayland: Create and destroy surface at show and hideKristian Høgsberg2011-01-254-10/+35
|
* wayland: Split input device out to its own fileKristian Høgsberg2011-01-254-163/+185
|
* Add wayland lighthouse pluginKristian Høgsberg2011-01-2510-0/+870
|
* Add Qt::Key_ScreenSaverPaul Olav Tvete2011-01-181-0/+1
|
* Configure: allow -no-framework for lighthouse.Morten Johan Sørvig2011-01-141-1/+1
| | | | (configure has trouble separating host and target platforms.)
* Lighthouse: Fix keyboard on testliteJørgen Lind2011-01-072-18/+7
| | | | Remove code which was wrong
* Lighthouse: Fix keyboard modifier handlingJørgen Lind2011-01-073-15/+23
| | | | QApplication allready knows the modifiers
* Lighthouse: Support external plugins.Morten Johan Sørvig2011-01-074-9/+63
| | | | | | | | | | | | | | | | | | Add -platformpluginpath command line option that spesifies an additional directory to scan for plugins. Also read QT_QPA_PLATFORM_PLUGIN_PATH. QlatformIntegrationFacgtory::create() now tries to load the plugin from the external path first. Similarly, keys() returns the keys from the extra path in addition to the "internal" keys API changes: QPlatformIntegration::create() and keys() now take an optional const QString &platformPluginPath. New file: externalplugin.pri, contains instructions and a base setup for building external plugins.
* Lighthouse: Adding support for EGL to testliteJørgen Lind2011-01-058-32/+287
| | | | | | | | There is really no good way of detecting if to use EGL instead of GLX using qmake. So this is the behavior for now: if QtOpenGL is compiled with "desktop gl" then use GLX if its compiled with OpenGLES2 then use EGL.
* Lighthouse: Make testlite compile on systems where QtOpenGL is ES2Jørgen Lind2011-01-054-6/+14
| | | | | compatible. Ie. it does not have glx. Haven't made the egl integration yet for testlite
* Build on Mac OS X.Morten Johan Sørvig2011-01-051-0/+4
|
* Compile on OS X.Morten Johan Sørvig2011-01-051-1/+1
|
* Merge branch 'master' into lighthouse-masterJørgen Lind2011-01-0516-41/+698
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-041-0/+2
| |\ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Allow QWidget with size larger than 16383 on Mac OS X (Cocoa)
| | * Allow QWidget with size larger than 16383 on Mac OS X (Cocoa)Prasanth Ullattil2011-01-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | The restriction in place seems to be from the carbon ages, this is not required for cocoa, so removing it. QWidget autotests runs as before. Task-number: QTBUG-11415 Reviewed-by: Joao
| * | Merge branch 'earth/file-engine-refactor' of ↵Qt Continuous Integration System2011-01-0414-41/+694
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-file-engines-refactor into master-integration * 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor: Fix link error on MacOS Fix qfile test crash with glibc Fix qfile test errors Update def files Add autotests for AutoCloseHandle / DontCloseHandle and RFile adoption QFile API: add API to specify if adopted file handles should be closed
| | * | Fix link error on MacOSShane Kearns2011-01-041-3/+3
| | | |
| | * | Merge branch 'earth/file-engine-refactor' of ↵Qt Continuous Integration System2010-12-3114-41/+694
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-file-engines-refactor into master-integration * 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor: Fix qfile test crash with glibc Fix qfile test errors Update def files Add autotests for AutoCloseHandle / DontCloseHandle and RFile adoption QFile API: add API to specify if adopted file handles should be closed
| | | * \ Merge branch 'earth/file-engine-refactor' of ↵Qt Continuous Integration System2010-12-3014-41/+694
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-file-engines-refactor into master-integration * 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor: Fix qfile test crash with glibc Fix qfile test errors Update def files Add autotests for AutoCloseHandle / DontCloseHandle and RFile adoption QFile API: add API to specify if adopted file handles should be closed
| | | | * \ Merge branch 'earth/file-engine-refactor' of ↵Qt Continuous Integration System2010-12-3014-41/+694
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-file-engines-refactor into master-integration * 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor: Fix qfile test crash with glibc Fix qfile test errors Update def files Add autotests for AutoCloseHandle / DontCloseHandle and RFile adoption QFile API: add API to specify if adopted file handles should be closed
| | | | | * \ Merge branch 'earth/file-engine-refactor' of ↵Qt Continuous Integration System2010-12-2414-41/+694
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-file-engines-refactor into master-integration * 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor: Fix qfile test crash with glibc Fix qfile test errors Update def files Add autotests for AutoCloseHandle / DontCloseHandle and RFile adoption QFile API: add API to specify if adopted file handles should be closed
| | | | | | * \ Merge branch 'earth/file-engine-refactor' of ↵Qt Continuous Integration System2010-12-2414-41/+694
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-file-engines-refactor into master-integration * 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor: Fix qfile test crash with glibc Fix qfile test errors Update def files Add autotests for AutoCloseHandle / DontCloseHandle and RFile adoption QFile API: add API to specify if adopted file handles should be closed
| | | | | | | * \ Merge branch 'earth/file-engine-refactor' of ↵Qt Continuous Integration System2010-12-2314-41/+694
| | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-file-engines-refactor into master-integration * 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor: Fix qfile test crash with glibc Fix qfile test errors Update def files Add autotests for AutoCloseHandle / DontCloseHandle and RFile adoption QFile API: add API to specify if adopted file handles should be closed
| | | | | | | | * | Fix qfile test crash with glibcShane Kearns2010-12-221-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test was using a FILE* after closing it (which was a pointer to deleted memory). glibc detects and asserts on this. If the test failed, then file could be closed twice too, so I fixed that at the same time. (would have caused a double free) Reviewed-by: joao
| | | | | | | | * | Merge branch 'earth/file-engine-refactor' of ↵Qt Continuous Integration System2010-12-2214-41/+691
| | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-file-engines-refactor into master-integration * 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor: Fix qfile test errors Update def files Add autotests for AutoCloseHandle / DontCloseHandle and RFile adoption QFile API: add API to specify if adopted file handles should be closed
| | | | | | | | | * | Fix qfile test errorsShane Kearns2010-12-211-3/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix compile error for non symbian targets Fix MSVCRT assertion failure Test file.handle() returns the right thing before and after file is closed. Reviewed-by: joao
| | | | | | | | | * | Merge branch 'earth/file-engine-refactor' of ↵Qt Continuous Integration System2010-12-2114-41/+655
| | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-file-engines-refactor into master-integration * 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor: Update def files Add autotests for AutoCloseHandle / DontCloseHandle and RFile adoption QFile API: add API to specify if adopted file handles should be closed
| | | | | | | | | | * \ Merge branch 'earth/file-engine-refactor' of ↵Qt Continuous Integration System2010-12-2114-41/+655
| | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-file-engines-refactor into master-integration * 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor: Update def files Add autotests for AutoCloseHandle / DontCloseHandle and RFile adoption QFile API: add API to specify if adopted file handles should be closed
| | | | | | | | | | | * | Update def filesShane Kearns2010-12-206-19/+237
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the new APIs + all the unfrozen changes on master Reviewed-by: Trust Me
| | | | | | | | | | | * | Add autotests for AutoCloseHandle / DontCloseHandle and RFile adoptionShane Kearns2010-12-202-10/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extended the existing tests which open a file from a handle to use symbian RFile as well (when testing on symbian). Added a new test to check the file handle is open/closed after closing a QFile, based on whether the file was opened with AutoCloseHandle or not. Reviewed-by: mread
| | | | | | | | | | | * | QFile API: add API to specify if adopted file handles should be closedShane Kearns2010-12-206-12/+277
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QFile behaviour has been to not close file handles adopted by open(FILE*, OpenMode) and open(int fd, OpenMode) functions. This is inconvenient for frameworks which want to return an opened QFile to the user. In this case it would be better to transfer ownership of the handle to the QFile. New overloads are added which take an additional parameter from the QFile::FileHandleFlags flags. Currently only one bit is used to provide the AutoCloseHandle option, but it is extensible. The AutoCloseHandle option tells the QFile backend that it should close the handle when close() is called, rather than the default behaviour which remains to flush the handle and leave it open. The DontCloseHandle option is the inverse of this, specifying the old behaviour of flushing but not closing the file handle. Symbian OS file handles are not compatible with int, they are an opaque data type which contains two integers. The first identifies to the kernel the file server session The second identifies to the file server the subsession object (the file) The reason for this is that it has a microkernel architecture, the kernel has no support for files - all files and file systems are handled by a user mode process called the "file server". So for symbian, a new QFile::open() overload is added for adopting a symbian RFile handle. The API mirrors the existing API for POSIX file handles, but takes an RFile reference rather than an integer file descriptor. Task-number: QT-2924 Reviewed-by: joao Reviewed-by: mread Reviewed-by: Oswald Buddenhagen
| * | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-041-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Set no brush when the brush is a solid patern transparent color.
| | * | | | | | | | | | Set no brush when the brush is a solid patern transparent color.Pierre Rossi2011-01-041-0/+2
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a bug in pdf print engine that was noticeable when printing a webpage: the missing image graphic didn't appear in the pdf. Task-number: QTBUG-16435 Reviewed-by: sroedal
* | | | | | | | | | | Add styleHint to fallback api for fontdatabases in LighthouseJørgen Lind2011-01-046-9/+39
| | | | | | | | | | |
* | | | | | | | | | | Create clearer sepperation between TestLiteMime and QTestliteClipboardJørgen Lind2011-01-044-161/+181
| | | | | | | | | | |
* | | | | | | | | | | Renamed variable name in TestLite event handlingJørgen Lind2011-01-041-20/+20
| | | | | | | | | | |
* | | | | | | | | | | Renamed QTestLiteStaticInfo to QTestLiteStaticJørgen Lind2011-01-046-67/+121
| | | | | | | | | | |
* | | | | | | | | | | Copy/Paste in testlite and also added QTestLiteStaticInfoJørgen Lind2011-01-0412-76/+1899
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which is a class to resolve atoms etc.