summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* Merge branch 'master' into lighthouse-masterJørgen Lind2011-01-0514-31/+518
|\
| * 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-0412-31/+514
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Merge branch 'earth/file-engine-refactor' of ↵Qt Continuous Integration System2010-12-3012-31/+514
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3012-31/+514
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2412-31/+514
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2412-31/+514
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2312-31/+514
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2212-31/+514
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | * Merge branch 'earth/file-engine-refactor' of ↵Qt Continuous Integration System2010-12-2112-31/+514
| | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2112-31/+514
| | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | * 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
| * | | | | | | | | | 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.
* | | | | | | | | | Fix keyboard when using modifiers for testliteJørgen Lind2011-01-041-1/+18
| | | | | | | | | |
* | | | | | | | | | Initial support for WS specific clipboard support in LighthouseJørgen Lind2011-01-047-74/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default implementation in QPlatformIntegration still supports in process copy/paste
* | | | | | | | | | Lighthouse: fix keyboard problem in testliteJørgen Lind2011-01-041-3/+3
| | | | | | | | | |
* | | | | | | | | | Make TestLite show windows in correct positionJørgen Lind2011-01-042-3/+27
| | | | | | | | | |
* | | | | | | | | | Add basic mouse context menues to lighthouseJørgen Lind2011-01-041-0/+8
| | | | | | | | | |
* | | | | | | | | | Refactored the keyboard event handling in testliteJørgen Lind2011-01-047-331/+997
| | | | | | | | | |
* | | | | | | | | | Remove current cursor optimizationJørgen Lind2011-01-042-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was broken since it didn't take care of the initial cursor.
* | | | | | | | | | Fix nativechild widget position in LighthouseJørgen Lind2011-01-043-18/+12
| | | | | | | | | |
* | | | | | | | | | Fix gstreamer phonon build on X11Jørgen Lind2011-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I added an x11{ } clause in the pro file for the plugin. But as it turnes out the x11 clause is defined in gui.pro so it is not available for use in any other pro or pri files. Also fixed a missing !qpa in qttest_p4.prf
* | | | | | | | | | Dont do backingStore.destroy in deleteTLSysExtraJørgen Lind2011-01-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is done by QWidgetPrivate::deleteExtra()
* | | | | | | | | | Handle the QWidgetPrivate::mapper structureJørgen Lind2011-01-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dont have widgets without a valid winId there
* | | | | | | | | | Remove Lighthouse specific code in QGLWidget constructorJørgen Lind2011-01-043-39/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | truth to be told, I can't remember why I decided that it was a good idea to have the code there. But clearly now I don't think so anymore. Such initialisation should happen in qgl_qpa.cpp chooseContext. If we tear down the window and the context then that has to be solved elsewhere.
* | | | | | | | | | Refactoring of testlite to conform with Lighthouse structureJørgen Lind2011-01-0413-996/+1005
| | | | | | | | | |
* | | | | | | | | | Add function QPlatformScreen::platformScreenForWidgetJørgen Lind2011-01-046-39/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This so there is some logical connection between what screen a widget belongs to
* | | | | | | | | | Added window focus handling to lighthouseJørgen Lind2011-01-0410-6/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The idea is that QPlatformWindows can request focus handling. And when actual focus shifting is done by windowsystem callbacks/events which are sent to QWindowSystemInterface
* | | | | | | | | | Merge branch 'master' into lighthouse-masterJørgen Lind2011-01-04304-5464/+14995
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-301-0/+8
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Clear WSERV content when a native child receives an "expose"Jason Barron2010-12-291-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Native child windows on Symbian can cause composition artifacts on S^3 because they own a visible RWindow instance, but the RWindow technically has no content because child windows paint their content to their parent's backing store. In the event that a native child widget completely obscures a top level, the composition engine does not understand that the child is "empty" and should clear the UI surface to let the top level "shine through". The result is that articacts can remain on the UI surface after a transition from a WSERV drawing app to a Qt (EGL rendering) app. To fix this issue, we call CWindowGc::Clear() when the native child widget receives an "expose" event. This clears the UI surface content and ensures the top level is visible even though it is technically below another RWindow. Task-number: QTMOBILITY-484 Reviewed-by: Jani Hautakangas
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-244-11/+98
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Prevented infinite loop in QMoviePrivate::next(). Added int overloads to QPoint operator* and operator*=. tst_qmessagebox: add debug to know why it fails QMessageBox wrong Show/Hide Details button label
| | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-244-11/+98
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Prevented infinite loop in QMoviePrivate::next(). Added int overloads to QPoint operator* and operator*=. tst_qmessagebox: add debug to know why it fails QMessageBox wrong Show/Hide Details button label
| | | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-244-11/+98
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Prevented infinite loop in QMoviePrivate::next(). Added int overloads to QPoint operator* and operator*=. tst_qmessagebox: add debug to know why it fails QMessageBox wrong Show/Hide Details button label
| | | | * | | | | | | Prevented infinite loop in QMoviePrivate::next().Samuel Rødal2010-12-221-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we're unable to read the first frame, we shouldn't return an end marker, as that will cause QMoviePrivate::next() to recurse indefinitely when the playCounter is set to -1 (infinite). Reviewed-by: Olivier Goffart
| | | | * | | | | | | Added int overloads to QPoint operator* and operator*=.Samuel Rødal2010-12-222-9/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For increased performance to avoid having to convert to qreal and back. Separating the qreal overload into float and double overloads is also necessary to avoid compiler errors about ambiguous overloads. Task-number: QTBUG-15872 Reviewed-by: Eskil Abrahamsen Blomfeldt
| | | | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-211-1/+1
| | | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QMessageBox wrong Show/Hide Details button label
| | | | | * | | | | | QMessageBox wrong Show/Hide Details button labelRaul Metsma2010-12-211-1/+1
| | | | | | |_|/ / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On LanguageChange event QMessageBox switches Show/Hide Details button label Customer portal case id: 00217646 Merge-request: 973 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-243-42/+104
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | / / / / | | | |_|_|/ / / / | | |/| | | | | |