summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-07-022-4/+19
|\ | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Re-apply licenseheader text in source files for qt4.7 Fix QWidget::palettePropagation2() autotest on Symbian (part 2) Fix QWidget::palettePropagation2() autotest on Symbian QTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5 Fix text color in some cases of QML and QStaticText Added qmlshadersplugin to Symbian s60installs.pro-file. Fix KERN-EXEC 0 errors in symbian bearer plugin
| * Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-012-4/+19
| |\ | | | | | | | | | | | | Conflicts: src/s60installs/s60installs.pro
| | * 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
* | | Merge branch '4.8-upstream' into master-waterWater-Team2011-06-2929-154/+367
|\ \ \ | |/ /
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-06-2913-88/+103
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Fix vertical positioning of glyphs in raster engine with FreeType Ensure a small event check interval on uikit platform. Change default application font for uikit platform. Use the QPoint memory layout change only on Desktop Mac Fix 2cb398e1d901e62384bb2b388761cfd18fc8804a in case of no coreservices Add IPHONEOS deployment vars to makespec Post key events via QWindowSystemInterface, don't post events direcly Use nicer fonts and a few little patches to uikit platform. Update README and qmlapplicationviewer to suit 4.8. Updated proof-of-concept UIKit mkspecs
| | * | Ensure a small event check interval on uikit platform.con2011-06-281-1/+1
| | | | | | | | | | | | | | | | For some reason I sometimes get huge nextTimerEvent() values.
| | * | Change default application font for uikit platform.con2011-06-281-0/+6
| | | |
| | * | Post key events via QWindowSystemInterface, don't post events direclyIan2011-06-272-27/+12
| | | | | | | | | | | | | | | | | | | | Merge-request: 1275 Reviewed-by: con
| | * | Use nicer fonts and a few little patches to uikit platform.Ian2011-06-276-18/+25
| | | | | | | | | | | | | | | | | | | | Merge-request: 1275 Reviewed-by: con
| | * | Update README and qmlapplicationviewer to suit 4.8.con2011-06-276-43/+60
| | | |
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into ↵Qt Continuous Integration System2011-06-284-69/+69
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging: Re-apply licenseheader text in source files for qt4.8
| | * | | Re-apply licenseheader text in source files for qt4.8Jyri Tahtela2011-06-274-69/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New files after previous license change round. Reviewed-by: Trust Me
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-06-272-2/+13
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Incorrect property name in QAccessibleAbstractSpinBox::setCurrentValue When asking for relations, don't crash on children that don't return an interface. Remove more inconsistencies with invisible. QAccessibleToolButton::text should return accessibleName if set. Remove stray semicolon. Do not expose text when echo mode is not Normal. Check validator when changing text using accessibility functions. Fix some issues introduced in df6713b8f55fc007796f40. Add tilde (both ~ and ~<userName>) expansion to QFileDialog on UNIX. Avoid bogus accessibility focus events from menus. Build fix for Mac OS 10.5 Avoided calling updateAccessibility() from updateMicroFocus if the item was hidden Notify a11y framework of FocusChanges for QGraphicsObject Call updateAccessibility on the QGraphicsObject in updateMicroFocus Fix updateAccessibility for QGraphicsObjects Make accessibility work on Windows with alien
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-06-279-25/+58
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Fix broken rpath on wayland Make sure to call damage on the buffer when we damage it Update the wayland plugin
| | * | | Fix broken rpath on waylandJørgen Lind2011-06-231-1/+4
| | | | |
| | * | | Make sure to call damage on the buffer when we damage itJørgen Lind2011-06-235-15/+18
| | | | |
| | * | | Update the wayland pluginJørgen Lind2011-06-234-11/+38
| | | | | | | | | | | | | | | | | | | | to shar bfea3d6befdb688d5354e6f15a9400ea637febf9
| * | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-06-241-0/+3
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/image/qpixmap_raster_symbian.cpp src/gui/image/qpixmapdatafactory.cpp src/gui/painting/qgraphicssystem.cpp src/gui/styles/qs60style.cpp src/network/bearer/qnetworkconfigmanager_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtOpenGLu.def src/s60installs/bwins/QtOpenVGu.def src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
| | * | 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 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-06-211-7/+14
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: QDeclarativeDebug: Fix cases where multiple packets arrive in one go Fix js debugging autotest on Windows + Add license header Rewrite autotests for js debugging Rename qdeclarativescriptdebugging autotest directory Create property cache in case of Component{} root
| | * | | QDeclarativeDebug: Fix cases where multiple packets arrive in one goKai Koehne2011-06-201-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure no packets get 'lost' when they're arriving in one go through the TCP/IP socket. Reviewed-by: Christiaan Janssen
| * | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-17108-1880/+1239
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc examples/draganddrop/fridgemagnets/main.cpp examples/script/context2d/main.cpp
| | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-06-142-20/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: When asking for relations, don't crash on children that don't return an interface. Remove more inconsistencies with invisible. Fix a problem where the video would'nt show on some containers QAccessibleToolButton::text should return accessibleName if set. Remove stray semicolon.
| | | * \ \ \ Merge remote branch 'upstream/4.8'Thierry Bastian2011-05-26458-7904/+7877
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch '4.8-upstream'Thierry Bastian2011-05-19105-152/+7190
| | | |\ \ \ \ \
| | | * | | | | | Remove more inconsistencies with invisible.Frederik Gladhorn2011-05-191-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visible status should not influence child count and other properties. Reviewed-by: Jan-Arve
| | | * | | | | | QAccessibleToolButton::text should return accessibleName if set.Frederik Gladhorn2011-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was most likely a copy and paste error. Reviewed-by: Denis Dzyubenko
| | | * | | | | | Remove stray semicolon.Frederik Gladhorn2011-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-24484-7229/+14080
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qrawfont.cpp src/gui/text/qtextlayout.cpp src/gui/util/qscroller.cpp src/gui/widgets/qlineedit.cpp
| * | | | | | | | | Squashed commit of changes from the 4.8-temp branch.David Boddie2011-05-113-0/+155
| | | | | | | | | |
* | | | | | | | | | Fix a11y crash: dock doesn't always have a widget.Frederik Gladhorn2011-06-281-7/+12
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also return dock widget title. Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
* | | | | | | | | Incorrect property name in QAccessibleAbstractSpinBox::setCurrentValueJosé Millán Soto2011-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1263 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* | | | | | | | | Merge remote-tracking branch 'upstream/4.8' into 4.8Frederik Gladhorn2011-06-12495-7907/+14322
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-06-0957-324/+276
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: QDeclarativeDebug: Don't hang if started with ',block' argument QDeclarativeDebug: Fix QJSDebugService if launched with ',block' Fix docs on caching for images loaded by image providers Fixed compile of tst_qscriptextensionplugin on some Windows configurations QDeclarative: fixed clean animation lists DeclarativeObserver: Don't fade in the highlight edge Renamed declarativeobserver plugin to qmldbg_inspector QmlDebugger: adding slots to items in Live Preview QmlDebugger: parsing packets iteratively in the communication protocol qmlplugindump: Bump QtQuick.tooling version to 1.1. qmlplugindump: Dump revision property. qmlplugindump: Fix --path usage with drive letters on Windows. ListView segmentation fault when setting highlight to null DeclarativeObserver: Fixed duplicates in item selection
| | * | | | | | | DeclarativeObserver: Don't fade in the highlight edgeThorbjørn Lindeijer2011-05-302-58/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It feels more responsive when the highlight is immediately visible. Change-Id: Ie3dd0693ecc38f33b001c86970b220b45b37fdfc Reviewed-by: Kai Koehne
| | * | | | | | | Renamed declarativeobserver plugin to qmldbg_inspectorThorbjørn Lindeijer2011-05-3057-264/+264
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mainly since it's a good idea to prefix the plugin on Symbian, and at the same time it's now consistency called 'inspector' rather than 'observer'. Symbian .def files will need to be updated. Change-Id: I43071331c8002f8844efd14105d01c730d97e946 Reviewed-by: Kai Koehne
| | * | | | | | | DeclarativeObserver: Fixed duplicates in item selectionThorbjørn Lindeijer2011-05-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only add items to the current selection that aren't already part of it. Also removed checking item for null, since it doesn't make sense to include null pointers in the list of items to select. Task-number: QTCREATORBUG-3426 Change-Id: I5a365570f87f72665b3382d05ca9937f56e8956b Reviewed-by: Christiaan Janssen
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-06-081-6/+107
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (32 commits) Fix autotest on Windows Compile on Mac OS X Ammend last commit Implemented QAccessibleTextEdit::attributes() Changing cursor position in all boundaries code clean-up for QSystemSemaphore simplify QSharedMemoryPrivate::cleanHandle() minor improvements for QSharedMemory fix potential keyfile leaking refactoring of the QWSSharedMemory class allow the user to averride QT_QWS_TEMP_DIR in qplatformdefs.h minor typo fix minor code simplification minor code simplification avoid the QT_NO_ASCII warning remove an unused headers nano optimization don't reallocate memory if the old buffer has sufficient capacity fix potential memory leaking don't delete the lock if it was not created by this surface ...
| | * | | | | | | | Ammend last commitHarald Fernengel2011-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squelch coding style warnings
| | * | | | | | | | Implemented QAccessibleTextEdit::attributes()José Millán Soto2011-06-061-5/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handling font properties and colors Created test: tst_QAccessibility::textAttributes Merge-request: 2626 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * | | | | | | | Changing cursor position in all boundariesJosé Millán Soto2011-06-061-1/+1
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1242 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-06-085-140/+313
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (54 commits) Update internal state before emitting configurationChanged() signals. Fixed qmlshadersplugin manual test shaders on SGX family GPU:s. Fixed qmlshadersplugin on windows VC2008 toolchain. Reset input context in Symbian when another window is opened. KERN-EXEC 3 panic in QCoeFepInputContext::translateInputWidget() Close context menus during orientation change. Have -small-screen enabled in certain examples on Symbian always. Update Japanese translations. Revert some of "Make QMLViewer startup animation stop after a while" Fix for winscw QtGui.def Add private method for flushing the pixmap cache. QDeclarative: Fix QPerformanceTimer on Symbian Fix QTreeWidget autotest cases on Symbian/VGA Increase SSL readbuffer 1 -> 16 kB Fix pixel metrics for Symbian VGA devices Revert "Fix QNetworkConfigurationManager usage outside main thread first" Avoid buffer overrun in QMacPixmapData resizing Fix glyph metrics with QStaticText/Freetype/raster and light/no hinting Fix tst_QGraphicsItem::sorting() test case for Symbian Fix QHeaderView test case for VGA Symbian devices. ...
| | * \ \ \ \ \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-06-081-0/+1
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | | * | | | | | | 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 remote branch 'upstream/4.8' into qt-4.8-from-4.7Toby Tomkins2011-06-0814-545/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/styles/qs60style.cpp
| | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-312-3/+12
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qtextengine.cpp src/gui/text/qtextengine_p.h src/gui/text/qtextlayout.cpp src/plugins/phonon/mmf/mmf.pro src/plugins/s60/5_0/5_0.pro tests/auto/qtextlayout/tst_qtextlayout.cpp
| | | * | | | | | | | | 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