summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Ensure that the corewlan plugin can be built with the Mac OS X 10.7 sdkOswald Buddenhagen2011-09-051-1/+1
| | | | | | | | | | When the 10.7 SDK was specified explicitly then it would fail the check inside the pro file. So this ensures that this is accounted for. Task-number: QTBUG-20516 Merge-request: 2657 Reviewed-by: ossi
* remove obsolete defineOswald Buddenhagen2011-09-051-1/+0
|
* Fix non-ascii name issues in ICD.Xizhi Zhu2011-08-182-3/+3
| | | | | PMO Bug 275663. Developed by Aapo Makela, reviewed by me.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-07-181-1/+3
|\ | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Prevent failed rendering for NPOT textures in GLES2. Don't use GL_REPEAT for NPOT textures in GLES2.
| * Prevent failed rendering for NPOT textures in GLES2.Samuel Rødal2011-07-181-1/+3
| | | | | | | | | | | | | | Shouldn't use the (default) GL_REPEAT wrap mode on GLES2 unless GL_OES_texture_npot is present. Reviewed-by: Kim
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-07-112-9/+14
|\ \ | |/ |/| | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixing WINSCW compile error
| * Fixing WINSCW compile errormread2011-07-112-9/+14
| | | | | | | | | | | | | | | | Refactoring the body of a large TRAP into a separate function. This was not compiling on WINSCW, perhaps due to the use of #ifdef within the TRAP macro expansion. It does compile now. Reviewed-by: Sami Merila
* | Fixes switching runtime graphics system when the maximized window is shown ↵Stanislav Ionascu2011-07-051-0/+8
|/ | | | | | | or hidden. Merge-request: 1287 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix KERN-EXEC 0 errors in symbian bearer pluginShane Kearns2011-06-282-4/+19
| | | | | | | | | The plugin was ignoring errors when opening a handle, and as a result crashed if the handle was invalid. Error checking / handle validity checks added. Task-number: QTBUG-18572 Reviewed-by: mread
* Workaround webkit deadlock on macos xShane Kearns2011-06-221-0/+3
| | | | | | | | | | | | | | | | | The webkit AtomicallyInitializedStatic and Qt's Q_GLOBAL_STATIC can deadlock on the Mac, as the mac compiler inserts calls to __cxa_guard_acquire and __cxa_guard_release around initialisation of local statics. In Q_GLOBAL_STATIC case, this is the QGlobalStaticDeleter local static Whereas webkit AtomicallyInitializedStatic is a local static variable in any case. Problem is triggered because webkit constructs QNetworkConfigurationManager inside the constructor of a local static - networkStateNotifier And the generic bearer plugin calls QNetworkInterface::allInterfaces in the bearer thread, which needs an initialised Q_GLOBAL_STATIC. Reviewed-by: Laszlo Agocs
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-06-081-0/+1
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update internal state before emitting configurationChanged() signals.
| * Update internal state before emitting configurationChanged() signals.Xizhi Zhu2011-06-081-0/+1
| | | | | | | | PMO Bug 257336.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-05-301-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed contains check casing in mmf.pro file
| * | Fixed contains check casing in mmf.pro fileTomi Vihria2011-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Contains check in mmf.pro was spelled in upper case, but qmake's internal contains function isn't case-insensitive and needs to be spelled in lower case. Reviewed-by: Miikka Heikkinen
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-05-263-6/+23
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed more CI-errors caused by qmlshadersplugin addition. Fixed CI-errors caused by qmlshadersplugin addition. Fixing Linux compatibility issues for Symbian Update the detection of is_using_gnupoc for S3. Backported QML ShaderEffectItem from QML2.0 into Qt Quick 1.1 Revert "Fixing Linux compatibility issues for Symbian" sockets: limit buffer size of the internal sockets in proxy engines
| * | Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-251-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | The patch applies everything from the original, except for the filename case changes in LIBS which are handled differently based on the auto-detected is_using_gnupoc CONFIG value. Reviewed-by: Laszlo Agocs
| * | Revert "Fixing Linux compatibility issues for Symbian"Laszlo Agocs2011-05-253-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing the library names to lowercase breaks 5.0-based Linux builds. It will be investigated if it is possible to change the SDKs instead. If not, the patch will have to be extended to use the original names for 5.0 and the lowercased ones otherwise. This reverts commit 5933d4e4fb8b48ebed641e7f6b1d032df253df30.
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-251-0/+6
|\ \ \ | |/ / |/| / | |/ | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix the state of default network configuration.
| * Fix the state of default network configuration.Xizhi Zhu2011-05-241-0/+6
| | | | | | | | | | | | | | PMO Bug 257336 - Default configuration remains in QNetworkConfiguration::Active state even when device moves out of WLAN coverage This fix sets the default network configuration (of type UserChoice) back to Discovered when the network session is disconnected. Reviewed-by: Cristiano di Flora
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-191-2/+2
|\ \ | |/ | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix brush transform in QtDirectFB backend, fixing QTBUG-18577
| * Fix brush transform in QtDirectFB backend, fixing QTBUG-18577Denis Oliver Kropp2011-05-191-2/+2
| | | | | | | | | | Merge-request: 1224 Reviewed-by: Marcel Schuette <marcel.schuette@nokia.com>
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-192-137/+299
|\ \ | |/ | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: directfb: Paint engine enhancements
| * directfb: Paint engine enhancementsDenis Oliver Kropp2011-05-192-137/+299
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Support negative scaling using DSBLIT_FLIP_HORIZONTAL/VERTICAL (DirectFB >= 1.4.3). - Implement drawing points. - Implement rectangular path filling. - Discard drawing when alpha is zero with SrcOver. - Also use DirectFB StretchBlit() if supported by hardware. - Unify/simplify pen/brush/composition support handling. - Enhance output when printing raster fallbacks. - Other minor cleanups. Merge-request: 991 Reviewed-by: Marcel Schuette <marcel.schuette@nokia.com>
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-05-183-15/+6
|\ \ | |/ |/| | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixing Linux compatibility issues for Symbian
| * Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-183-15/+6
| | | | | | | | Reviewed-by: Laszlo Agocs
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-17198-3380/+3380
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updating file with CRLF line endings for the updated header Fix a regression in QList::mid() update gitignore remove -fno-stack-protector Fix make confclean Update licenseheader text in source files
| * | Update licenseheader text in source filesJyri Tahtela2011-05-13198-3380/+3380
| | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-05-161-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed bug in meego graphics system runtime switching.
| * | | Fixed bug in meego graphics system runtime switching.Samuel Rødal2011-05-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch when the last _visible_ widget is destroyed (and also switch back when a widget is mapped and there are no other visible widgets). Reviewed-by: Armin Berres
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-05-102-2/+18
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix QtCoreu.def file error Introduce platform extension to QGraphicsSystem Update changes for 4.7.3 Show softkeys when opening a dialog that has a fullscreen parent. QSslCertificate: report fraudulent certificates as invalid QSslCertificate: fix test for blacklisted certs on Windows QSslSocket internals: abort on encountering blacklisted certificates QSslSocket: add test for blacklisted certificates Changes for 4.7.3 Fix for wrong dpi metrics for raster pixmaps on Symbian. Fix qgraphicstransform autotest for Symbian, where qreal is float. QS60Style: QTreeView::indexRowSizeHint returns incorrect value QDeclarativeDebug: Export needed symbols on Symbian Bump Qt version to 4.7.3 Fix QTBUG-17627: build break in mobility bearer applications Fix for major regression in OpenVG clipping Unsuccessful unlocking of QNetworkConfigurationPrivate mutex
| * | Introduce platform extension to QGraphicsSystemJani Hautakangas2011-05-102-2/+18
| |/ | | | | | | | | | | | | | | | | Qt on Symbian needs some special capabilities to be able to work on 32MB GPU. This patch introduces some Symbian specific functions to QGraphicsSystem Task-number: QTBUG-17882 Reviewed-by: Laszlo Agocs
* | Fix -no-guiBernhard Rosenkraenzer2011-05-091-2/+2
|/ | | | | | | | -no-gui still tried to build the graphicssystem and inputmethod plugins, both of which require QtGui Merge-request: 1215 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-201-1/+1
|\ | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: QDeclarativeDebug: Fix endless loop for property with SCRITABLE false Fix Symbian/Linux compilation breakage in plugins/qmltooling Make QMLViewer startup animation stop after a while Fix excessive scrolling in TextInput with mid string pre-edit text.
| * Fix Symbian/Linux compilation breakage in plugins/qmltoolingKai Koehne2011-04-201-1/+1
| | | | | | | | | | | | | | use QIODevice header file instead of (wrongly capitablized) QIODevice.h Reviewed-by: Tom Sutcliffe Task-number: QTBUG-18869
* | Fix build of Qt/DirectFB without graphics view support.Denis Oliver Kropp2011-04-181-1/+3
| | | | | | | | | | Merge-request: 1187 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-1510-7/+703
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: QmlDebug: Fix license headers in new ost plugin Fixed autotest after b4b85257ccff6ba21bcbcbd46a9f7f09884abe79 Resolve unqualified attached properties correctly Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Symbian. QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp' QDeclarativeDebug: Don't crash when connection is closed Fix so concurrent jobs produce the correct model results Fix uninitialized variable.
| * QmlDebug: Fix license headers in new ost pluginKai Koehne2011-04-155-65/+65
| | | | | | | | Reviewed-by: Trust-me
| * Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on ↵Tom Sutcliffe2011-04-147-0/+692
| | | | | | | | | | | | | | Symbian. Task-number: QTBUG-18764 Reviewed-by: kkoehne
| * QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp'Kai Koehne2011-04-144-4/+3
| | | | | | | | | | | | | | Make the name less ambiguous, especially on Symbian were all .dlls end up in sys\bin. Reviewed-by: Pawel Polanski
| * QDeclarativeDebug: Don't crash when connection is closedKai Koehne2011-04-141-3/+8
| | | | | | | | | | | | | | | | | | Protocol might still be in the process of processing messages when disconnect() is called (e.g. due to an invalid package). Therefore delay it's deletion until the next event loop runs. Reviewed-by: Christiaan Janssen Task-number: QTBUG-18771
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-311-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed not switching to MeeGo graphicssystem. Fixed rounding of coordinates pre-transformation in CG paintengine. Don't include qwindowsurface_gl_p.h on QT_OPENGL_ES_1.
| * | Fixed not switching to MeeGo graphicssystem.Samuel Rødal2011-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | | If two windows become maximized at once we might not switch, this is an attempt at fixing that. Reviewed-by: Armin Berres
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-291-1/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QMeeGoLivePixmapData: Verify dimensions of locked pixmap
| * | QMeeGoLivePixmapData: Verify dimensions of locked pixmapSami Kyostila2011-03-281-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a switch from HW rendering to SW rendering is done, all EGL surfaces backing a live pixmap become invalid because EGL is terminated. Thanks to a recent patch, all live images are now automatically invalidated when SW rendering is activated. Even with this mechanism in place, it is possible for the underlying EGL surface to be different than what the live pixmap is expecting. This can happen, for instance, if the X pixmap gets destroyed and a different X drawable is created using the same XID. Even though this is an unlikely scenario, it can result in a complete system failure if the surface dimensions do not match and the live pixmap user ends up writing over internal graphics driver structures. This patch adds a safeguard which disallows locking EGL surfaces with non-matching dimensions. Fixes Harmattan bug NB#237138. Merge-request: 2583 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-281-3/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update changes for 4.7.3 directfb: avoid version dependency by setting DSPD_DST blend functions manually fix -enable-stdcall-fixup usage Report that an update is needed if no update was done
| * | directfb: avoid version dependency by setting DSPD_DST blend functions manuallyDenis Oliver Kropp2011-03-281-3/+2
| | | | | | | | | | | | | | | Merge-request: 2558 Reviewed-by: Marcel Schuette <marcel.schuette@nokia.com>
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-232-10/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixes QT-4753
| * | Fixes QT-4753Xizhi Zhu2011-03-232-10/+13
| | | | | | | | | | | | | | | | | | Invalid read in ICD plugin for bearer management. Reviewed-by: Iiro Kause
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-222-4/+0
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Implement tiled image and pixmap drawing in VG paint engine. Changed maximum heap size for qmlflickr on Symbian. Change Symbian to use destroyed swap behaviour in GL Remove useless profile reference.
| * | Remove useless profile reference.axis2011-03-222-4/+0
| | | | | | | | | | | | | | | | | | | | | The profile has been empty since the plugin functionality was moved into QtMultimedia itself (d73df73c556b0a225fdde7341549ed834bc691f4). RevBy: Miikka Heikkinen