summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Implement window modality in QtGuiBradley T. Hughes2012-04-119-146/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QWindow already has windowModality() and setWindowModality() as part of its API from commit 516f4e283ba4626d7239630397ef867ab0366071. Platform plugins can use this already to setup modality hints on windows that they create, but it's not enough to implement modality fully. QGuiApplication gets a modalWindow() static method, which is similar to QApplication::activeModalWidget() in that it returns the last modal window to be shown. The modal window "stack" moves from QApplicationPrivate to QGuiApplicationPrivate. The enterModal*() and leaveModal*() functions in QApplicationPrivate are removed and replaced by QGuiApplicationPrivate::showModalWindow() and hideModalWindow(), which are called by QWindow::setVisible() just before calling QPlatformWindow::setVisible(). The virtual QGuiApplicationPrivate::isWindowBlocked() will tell us if a window is blocked by a modal window (and tell which modal window for any interested callers). The default implementation works on the QWindow level. QApplicationPrivate reimplements isWindowBlocked() and adds popup and WA_GroupLeader support. QGuiApplication uses the state set from isWindowBlocked() to block user-input events: mouse press, mouse move, mouse release, wheel, key presses, key releases, enter/leave events, close events, and touch begin, update, and end events. Note also that the modality helper functions in QtWidgets and QApplicationPrivate are left in place and working as they always have. The behavior of QWidget in the presence of modal windows/dialogs should not change. Change-Id: I2c89e6026d40160387787a6e009ae1fdc12dfd69 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* | | | Don't crash when comparing values containing empty arrays/objectsLars Knoll2012-04-113-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-25164 Change-Id: I1fa00e359ef3583b9a7136bb888cdf5e1c3e75ac Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
* | | | QDoc: Fix no-examples option.Martin Smith2012-04-111-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was accidentally removed in the big change regarding searching in the internal QDoc tree. Change-Id: I2496d7497d239f1ec5fbd01be6a918c1ef29fc95 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | | | qdoc: Fixed to report read-only QML properties correctlyMartin Smith2012-04-117-179/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the default for a QML property is writable. If qdoc can't detect the actual read-only status, writable is assumed. There were some cases where qdoc could not determine the actual read-only/writable status for a QML property. In these cases, qdoc reported read-only because the default was read-only, which was not optimal. Change-Id: I55aeb2bedcde92a414f4d48a8d995e5e9dbca5da Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | | | QChar: optimize some methods a bit for general caseKonstantin Ritt2012-04-112-18/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by reordering and regrouping conditions so that they lead to result earlier in most-common usecases (l.letters, spaces and puncts, u.letters, other); there are no title cased letters in range [0..127] -> use this in isTitleCase(); test for 0xa0 (nbsp) early in isSpace() as it is quite common in HTML, etc.; add early test to isNumber(). Change-Id: Ib415f34cb1212d9ccf8753de2d1beaece1aa2243 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | Use windows API to update missing CA rootsShane Kearns2012-04-115-14/+254
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows ships with a minimal set of CA roots. When using windows API to verify a certificate, it will fetch the root certificate from windows update (assuming it is part of the Microsoft trust program). As we are using openssl, this does not happen transparently. If SSL errors occur which indicate a broken chain then attempt to fix it using the windows API before emitting sslErrors. If the system CA certs are not in use (a CA bundle has been set on the socket or as the global configuration), then this is skipped. This is so an application can continue to use its own cert bundle rather than trusting the system certs. Key usage is specified, so that windows will return not trusted status if the root is not suitable for SSL (server auth or client auth OID). Testability: - to test, must delete the CA cert(s) from the "third party root certification authorities" section of the cert store using mmc.exe. - If the workaround of installing the windows XP cert bundle was performed, then you also need to delete certs from the "trusted root certification authorities" section. This is dangerous, be careful not to delete the required certificates which are documented on MS website - Naturally, modifying these areas of the cert store requires elevated privilege. Task-number: QTBUG-24827 Change-Id: I5cfe71c8a10595731f6bbbbabaaefa3313496654 Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | Modified project files to be iOS compatible.Qt4iOS2012-04-116-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed some MacOS source code files from iOS build. Use unix standard paths for now (iOS-specific implementation will come later). Change-Id: I8b2731b431b3a379a1ec4ec07d227e886209e3e9 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* | | | Add support for QPlatformNativeInterface.Hannu Lyytinen2012-04-115-3/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial bits to enable figuring out the EGL display and context. Change-Id: I4b578e356dceb40b4456f0590d32c8df1f51fa53 Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
* | | | Use correct framebuffer object.Hannu Lyytinen2012-04-112-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KMS plugin deals with FBO IDs not equal to zero (the default FBO), so return the correct ID. Change-Id: I904fc0b8d732f856b4526bd7f73cc48c358c8441 Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
* | | | Release the EGL context after initialization.Hannu Lyytinen2012-04-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Threaded applications like qmlscene could not bind the EGL context if the context is already bound in the other thread. Change-Id: Ia75ef9e76ebff48aa2c9b348101ab2f388e18c5e Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
* | | | Use the new plugin system in the KMS plugin.Hannu Lyytinen2012-04-113-16/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Sync up the KMS QPA plugin with the plugin system changes. Change-Id: Ifaa8be6f11aeb93acc63643c62ca15db4e9bc38f Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
* | | | Change default value of QMAKE_LIBS_OPENGL_ES1 to libGLESv1_CMJason Barron2012-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The naming convention for these libraries says that libGLES_CM is to be used when EGL is included while libGLESv1_CM should be used when EGL is not included. Since we have a seperate variable for libEGL, it makes sense to have this variable represent the non-EGL version of the library. Change-Id: I9147c116da7be4a296a0ebeac39762b46725f10e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | | | Remove Qt5 to-do comment in qtexthtmlparser.cpp.Jason McDonald2012-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The comment relates to a change that is neither source- nor binary-incompatible, so the change can be done in any minor release. Task-number: QTBUG-25117 Change-Id: Ifba3ef53241f9bf2504c573066e4cfa5fbfe679e Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* | | | eglfs: rework hooks designGirish Ramakrishnan2012-04-1110-59/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two problems with the current design: 1. if (hooks) hooks->foo() doesn't work in debug mode when no platform hook is defined. The problem doesn't arise in release mode because the compiler optimizes away the if (hooks) into a no-op since hooks is NULL when no platform hook is defined. 2. Adding a new hook requires changing every platform's hook implementation. New approach: 1. Define QEglFSHooks as a class with virtual functions. A stub file provides the default implementation. 2. Platform hooks derive from above class and reimplement whatever is needed. The filenames and variables have been changed to be more in line with the Qt style. Change-Id: I2eaaa5ad7c8b48a06361c4747d4f210c428c983f Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | | | Extend eglhooks to include hasCapabilityDonald Carr2012-04-116-7/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add BufferQueueingOpenGL to Raspberry PI's numerous capabilities Change-Id: I1197c28a0c82df3ae2f6d5360791010e17373555 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | | | Add Mac OS X backend for QDesktopServices.Christoph Schleifenbaum2012-04-115-0/+138
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie48844ed93385c8aef9ae0765b7a3d26583ed642 Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* | | | QHeaderView - remove some (nearly) unused span functionsThorbjørn Lund Martsum2012-04-112-21/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes a couple of functions. Two of them are unused and the last one has its (now) very simple implementation inlined in the only caller. The last function was called something with spans and we would like to get away from using the word 'span' since we no longer uses spans. Change-Id: Icef95166289d52bd958400cba70daceb6fa75913 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | | QHeaderView - rename many spans classes and variablesThorbjørn Lund Martsum2012-04-113-96/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In (SHA) b800d8b94a7861ecf8853621f6556fca186fb5b7 the span model was replaced with a plain section model. The code however still has variables and classes called someting with spans which would be confusing for possible new readers of the code. This patch cleans up most of it. It only renames classes,functions and variables (and not any semantics or the public API). Change-Id: I6ceb068c7317223f0d8e37f8032197f518d0174c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | | Fixed syncqt to ignore all lines that define Qt namespaceDenis Dzyubenko2012-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That includes non-standard macroses for QtAddOns, e.g. for QtJsonDb addon the macro looks like QT_BEGIN_NAMESPACE_JSONDB - by default syncqt doesn't recognize the macro and concantenates it with the next line in the header file, which breaks forward include generation if that next line is the class definition. Change-Id: Ia269f8a091113e4951d6a2615ef392b21bd5e3a3 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | | Automatically query for Mac Proxy Server credentialsAron Rosenberg2012-04-112-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for automatically searching the Mac System Preferences for proxy server username/password. If a user has put credentials in the SystemPreferences->Network->Interface->Proxies area, we will now look in the KeyChain for those files. This will automatically pop up a Permissions dialog from the OS if valid credentials were found which match the server we are trying to access. Task-Number: QTBUG-22033 Change-Id: Ic7952afab4d16a65a87bb2f97a928c1c91167fe7 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* | | | Add Proxy Auto Config support (PAC) on MacAron Rosenberg2012-04-112-5/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds support for fetching and parsing Proxy Auto Config files if one is specified in the Mac System Preferences Task-Number: QTBUG-2069 Task-Number: QTIFW-28 Change-Id: I91feb999222187e7467f2c41383904cf0cff8633 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* | | | Minor clean up in QTextOption APIEskil Abrahamsen Blomfeldt2012-04-112-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Source compatible, but binary incompatible, change to QTextOption API to make it consistent with Qt's coding style. Change-Id: I368f13925339fa41025a570f684f4b944844a022 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* | | | Made qt_accStripAmp handle "&&"José Millán Soto2012-04-111-12/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed qt_accStripAmp implementation to handle texts which contains pairs of ampersands representing a single ampersand. In order to do that, a new static function called qt_accAmpIndex was created. This function is based on the code of qt_accHotKey, which was changed to use qt_accAmpIndex. Change-Id: Idcc5d07581d7fb3251c30399b189740ca8071104 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com> (cherry picked from commit f864f8f79b88bbc3cc9007d2a92b08ca4b5cb871)
* | | | replace hardcoded values with a surrogate handling methodsKonstantin Ritt2012-04-112-20/+18
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iba079953c46a29404232d2dacbe0c90170097d51 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | | | minor improvement for NormalizationCorrectionsKonstantin Ritt2012-04-113-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | let's don't hardcode the latests affected version value and simply use the one parsed from NormalizationCorrections.txt Change-Id: I37021e8238d77deada4c5ba7a2d160c87186b9dd Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | | | fix digitValue() returned 0 instead of -1 for invalid ucs4 charactersKonstantin Ritt2012-04-112-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20318 Change-Id: I96c4c2b042bad478b7c704669e7ea0d574d3b22f Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | | | Add imports directory to ignore listYuchen Deng2012-04-111-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Iac2ae46ff606e6c71628ca480ac1b5fe82d9bf4e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | Fix crash with evaluation licenseSamuli Piippo2012-04-111-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With QWS, an infinite loop is formed at application startup when commercial evaluation license is used and QT_EVAL is defined. Change-Id: If9712428932b51f5c8eee9ef2d0d444da06a25d9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | Removed Qt 5 todo comments from qgl.h / qgl_p.h.Samuel Rødal2012-04-102-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No point in changing QGLContext API when QOpenGLContext is meant to obsolete it. Task-number: QTBUG-25074 Change-Id: Ie21692c8c402ed9cd6af56bef0175c4e46c3d8a9 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | | | Removed Qt5 todo comment in qpaintengineex_p.hSamuel Rødal2012-04-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This won't get done for Qt 5, and QtOpenGL still implements this API. Task-number: QTBUG-25069 Change-Id: Ia8437d2a4a5a0e750afdf67764c53d75ee8065f6 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | | | Bump some Qt 5 to-do's to Qt 6.Jason McDonald2012-04-1013-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Source-incompatible changes are no longer desirable for Qt 5, so these items must wait until at least Qt 6. Task-number: QTBUG-23524 Change-Id: I0b9ae5f6f3a792e0169a4b0d3aefbdcb744acd2f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | | | Add missing virtual destructor.Jan-Arve Saether2012-04-101-0/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I94ac82ad4771b2b4c36ac24cc412fa43a0d77afb Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* | | | fix mingw detectionMark Brand2012-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I7eb78ebd79bfc1be36cc43a1f41f4e574b063aed Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | | | Save configuration feedback into config.summaryGirish Ramakrishnan2012-04-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scrolling the configure output to locate the build configuration is painful. So save it in config.summary. Change-Id: I40a2f7628e9a2b91a8ea44619dd49c00d5a61561 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | remove CODEC_FOR_C_STRINGS leftoversKonstantin Ritt2012-04-101-9/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Iaafb945882e3f6ad6d39f7eefb62b83ff50a9ba8 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | | | Document QEvent::ThreadChangeOlivier Goffart2012-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That event is mentioned in the documentation of QObject::moveToThread, but not in the documentation of QEvent::Type Task-number: QTBUG-16787 Change-Id: Iab769307d3de54881a82e59bed63b3831a3ffb29 Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
* | | | Remove Qt5 to-do comments in qtextformat.cpp.Jason McDonald2012-04-101-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These won't be done for Qt 5.0 and to-do tasks really belong in a bug-tracker not in the code. Task-number: QTBUG-25072 Change-Id: Ife4ff148167e0f0c66a58233548f4011b0b10784 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* | | | Make it possible to enable non-scalable font scalingMiikka Heikkinen2012-04-108-12/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows native font engine supports scaling of non-scalalble fonts, so make it possible to do so. Added two functions to QPlatformFontDatabase: fontsAlwaysScalable() and standardSizes(), and made fontsAlwaysScalable() to return true for Windows native font database. Windows Freetype font engine doesn't seem to support scaling of non-scalable fonts, so didn't enable it in there. Added implementation of standardSizes() for Mac OS. Task-number: QTBUG-24970 Change-Id: I41c9356ede8a37b7c61db94340dbeb5b629f34b9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* | | | Don't hardcode the default families in qfont_qpa.cppPierre Rossi2012-04-106-52/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since different platforms come with different fonts, we should probably leave it up to the platform to decide which family to use. Change-Id: I18bb81c0ce87cc7e9ac7f3abaeae1b41c0ce8410 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* | | | Fix crash with invalid pre-edit position.Andrew den Exter2012-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure the script item position is within the bounds of the text block when adjusted to compensate for pre-edit text. Change-Id: I2c745bf08afc0d9bc3aba27c24c2a123af017dc6 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* | | | Remove unused signal QWindow::backBufferReadyGirish Ramakrishnan2012-04-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backBufferReady is not used anywhere Change-Id: Ic5c8f6a89e031b3bd757b03f60737d55be969ee5 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | | | Blackberry OS implementation of QStandardPathsRafael Roquetto2012-04-103-1/+110
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I31427b896ca691de7071da17af4863d16348df7b Reviewed-by: David Faure <faure@kde.org> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | | | Fixed build issue when using GLEW with MSVCAndy Nichols2012-04-103-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSVC does not support the #warning precompiler command and is considered an error when used. This change checks for GCC before issuing the warning. Change-Id: Iee1e27841fe77b0289e88b7b4ccaa176ab56a39d Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | | | eglfs: Implement xlib based hook for testingGirish Ramakrishnan2012-04-102-0/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a hook implementation for X11 using xlib. This is primarily for testing. xcb is not used since the x11/egl-mesa integration appears to be done through xlib. Currently, there is no input mechanism. The size can be adjusted using EGLFS_X11_SIZE environment variable. Change-Id: Ifcfbfd958d9d110d94e22f04dfad1f6c29818103 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | | | Remove QWS era pvr headersDonald Carr2012-04-103-748/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QWS powervr plugin ceased to exist with the move to QPA; these headers are therefore entirely redundant Change-Id: I28c7baae15df5bb9d7ea3763e3a018e9e1ae1fc6 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | | | Fix header inclusion guardsGirish Ramakrishnan2012-04-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The inclusion guards refer to the old graphics system code Change-Id: Ifa72e3030c83797e471735a9a696bf12c0f75b08 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* | | | Fix constness of QPlatformCursorImage::hostpot()Girish Ramakrishnan2012-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QPlatformCursorImage::hotspot() should be const. Change-Id: I2b517098e75b013947386a5a620a15dc48e76cec Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* | | | QTypeInfo: document Q_PRIMITIVE_TYPE existing practiceMarc Mutz2012-04-091-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Despite the documentation requiring Q_PRIMITIVE_TYPEs to be PODs, existing practice in Qt (QFixed, QFlags, QUuid) is to allow constructors on primitive types as long as every bit pattern represents a valid object (ie. memory doesn't have to be initialised to hold an object of the type) and memcpy() can be used to create an independent copy of the object (memcpy()ing QString, e.g., while creating two valid objects, doesn't create independent copies). Change-Id: Ia85d48b89f6cc84e69ea76719eab9a858d247ad6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* | | | Moving stack-smashing protection to the Blackberry mkspecsSean Harmer2012-04-063-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It transpires that QNX 6.5.0 does not yet have libc support for the gcc stack smashing protection. Change-Id: Ic635662b6aa3ce2fad5f69e236386ae9ace420db Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | Fix compilation with MinGW-W64.Debao Zhang2012-04-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These types and values and been defined propsys.h from MinGW-W64 Version2 on. Change-Id: If74b7cf07a0fce414009c86519494a782508d8fe Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>