summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'lighthouse/4.7' into lighthouse-masterJørgen Lind2010-08-0543-1210/+1441
|\
| * Make QWidget::setPlatformWindowFormat recreate platformWindowJørgen Lind2010-08-041-1/+1
| | | | | | | | | | if the platformWindow is visible. Also had to make sure that the QGLContext of a QGLWidget was recreated.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouseJørgen Lind2010-08-0328-271/+2885
| |\ | | | | | | | | | | | | Conflicts: configure
| | * Merge remote branch 'staging/4.7' into bearermanagement/icd-static-libsAaron McCarthy2010-07-287-117/+209
| | |\
| | * | Statically link to Qt based dependent librarys.Aaron McCarthy2010-07-281-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the library dependencies of the ICD Bearer Management plugin use Qt. We include them in src/3rdparty and link against them statically to avoid the circular build dependency. Libraries that do not use Qt are still linked dynamically. The libraries which are statically linked are libconninet and libgq-gconf. Task-number: QTBUG-12354
| * | | Make QOpenKODEWindow not delete context when in fullscreen modeJørgen Lind2010-08-032-29/+32
| | | |
| * | | Make it possible to view what format a QPlatformGlContext hasJørgen Lind2010-08-036-5/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPlatformGlContext has now a pure virtual format getter. The way its intended to work is that the tlw has a QPlatformWindowFormat which is the requested format. Once you get the QPlatformGlContext of the window, you can request the QPlatformWindowFormat of the context to see what you really got.
| * | | Make openkode plugin handle eventsJørgen Lind2010-08-0210-293/+496
| | | | | | | | | | | | | | | | And make it also work without a gui manager
| * | | Make eglfs use defaultsharedcontextJørgen Lind2010-08-022-0/+6
| | | |
| * | | Made QPlatformWidnow::glContext a const functionJørgen Lind2010-07-277-15/+10
| | | |
| * | | Add QT_BEGIN_NAMESPACE and QT_BEGIN_HEADER to openkode pluginJørgen Lind2010-07-276-2/+22
| | | |
| * | | Refactored the eglfs pluginJørgen Lind2010-07-2712-412/+654
| | | | | | | | | | | | | | | | | | | | | | | | | | | | seperated the functionality into different files, and made the paintdevice belong to the windowsurface. Everything really belongs to the screen, since everything is full screen but, this makes it more on par with the other plugins.
| * | | Renamed files in EGLFS platform pluginJørgen Lind2010-07-274-5/+7
| | | |
| * | | Make it possible to have shared contexts to LighthouseJørgen Lind2010-07-233-60/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a getter to QPlatformGLContext for the "default shared context". The setter is protected as it is the plugins responsibillity to create it or not. QPlatformWindowFormat has also gotten a pointer to a QPlatformGLContext for a non default shared context. Only implemented shared contexts in testlite for now.
| * | | Removed createBlittable factory function from PlatformIntegrationJørgen Lind2010-07-2214-441/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and moved it onto QBlittablePixmap making the class abstract. The creator function was seen as to spesialised to be part of the PlatformIntegration class, and belonged to the QBlittablePixmap class anyway since that was the PixmapData type you would need to return to use the blitter api. Also removed the cross platform examples as they are more confusing than anything else. For usage of QBlittable look in the directfb platform integration plugin.
* | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-0427-269/+2880
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: configure
| * \ \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-07-2827-269/+2880
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| | * | | Cherry pick fix for MOBILITY-1234 from Qt Mobility.Aaron McCarthy2010-07-281-0/+2
| | | | | | | | | | | | | | | | | | | | e51af0d74f8bb6ca6100d2338671d2d053bfed01
| | * | | Cherry pick fix for QTMOBILITY-408 from Qt Mobility.Aaron McCarthy2010-07-282-33/+34
| | | | | | | | | | | | | | | | | | | | 7f9a8ebcfe86d3df428707888c3ab5fcd10226a4
| | * | | Cherry pick fix for MOBILITY-1194 from Qt Mobility.Aaron McCarthy2010-07-283-24/+68
| | | | | | | | | | | | | | | | | | | | f84bb604d745c512db8d53410c5fec835309f85e
| | * | | Fix compilation error on Symbian^4.Aaron McCarthy2010-07-283-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | The root cause is failing compilation test for SNAP when it shouldn't, but it should still not result in compilation errors in code.
| | * | | Fix detection of OCC functionality.Aaron McCarthy2010-07-281-1/+1
| | | | |
| | * | | Cherry pick fix for MOBILITY-1194 from Qt Mobility.Aaron McCarthy2010-07-283-48/+93
| | | |/ | | |/| | | | | | | | | 2f582953ecfc53f217317f58e4fc75b5b51a1126
| | * | Cherry pick fix for MOBILITY-1145 from Qt Mobility.Aaron McCarthy2010-07-271-1/+3
| | | | | | | | | | | | | | | | f17d8a5dbef076046ff504fecb1fd445c9b785ac
| | * | Cherry pick fix for MOBILITY-1144 from Qt Mobility.Aaron McCarthy2010-07-271-2/+15
| | | | | | | | | | | | | | | | 426ff79e49d4abb659167541bb67846443b9707e
| | * | Order network configurations in service networks in priority order.Aaron McCarthy2010-07-231-37/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is useful to know the priority order of the sub configurations of a service network. Task-number: QTBUG-11678 RevBy: juhvu <qt-info@nokia.com>
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-221-0/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added silent behavior to the most important Symbian build steps. Fixed compiling with symbian/linux-armcc and configure -silent option Removed some warnings from armcc that are unneeded. Made the makefile build system use QMAKE_CFLAGS.xxx properly. Automatically disabled unsupported modules for certain compilers. Fixed an incorrect profile inclusion.
| | | * | Added silent behavior to the most important Symbian build steps.axis2010-07-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-11927 RevBy: Trust me
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-211-2/+6
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revert "Compile fix for MSVC" Compile fix for MSVC Improve QAccessible for QAccessibleTabBar Improve QAccessible for QTabBar fix the export macros for the QtDBus module rebuild configure.exe make "configure -qt-gif" work again on Windows Fix a typo in harfbuzz thai line breaking. Ensure that font sizes that are > 0 and < 1 are still respected
| | | * | Improve QAccessible for QAccessibleTabBarSebastian Sauer2010-07-211-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On QAccessibleTabBar::text return text of the current tab for the case the QTabBar itself is asked for it's Name. Merge-request: 2405 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-211-2/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Use aligned load for the blending of RGB32 over RGB32 tst_moc: workaround gcc bug. Some more change to the changelog Fix compilation with QT_NO_GRAPHICSVIEW Updates changes-4.7.0 Fixes the Oracle nchar bug when NLS_CHARSET is different with NLS_NCHAR_CHARSET. Add a missing file in the config.test for SSE 4.2 Remove the masking when computing qAlpha() Add support for more vector instructions on x86 Workaround gcc bug, disable test with old version of gcc Do not crash due to a infinite recursion when using voiceover on MacOS doc: Fix qdoc errors for text related files QGraphicsItem: Animation leaves drawing artifacts when clipping is used. moc: Slot with complex template default value does not compile
| | | * \ \ Merge branch 'QTBUG-6843' into 4.7Jan-Arve Sæther2010-07-201-2/+2
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Do not crash due to a infinite recursion when using voiceover on MacOSJan-Arve Sæther2010-07-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason for the infinite recursion was that QAccessibleTitleBar::object() returned the titlebar's dockwidget. This could lead to a problem when the AT client tried to traverse the accessibility hierarchy: As a response to QAXChildrenAttribute (retrieve children) on a dock widget node, it would register it's children in the hierarchy manager. In this case, the object registered for the titlebar interface was the QDockWidget. In order to do further traversal, the bridge could call queryAccessibleInterface on the list of retrieved children to get the QAccessibleInterface for those objects, however, that would return the QAccessibleDockWidget interface that we just had traversed,.... Task-number: QTBUG-6843 Reviewed-by: Carlos Manuel Duclos Vergara
| | * | | | Merge branch 'raptorConfigurePatches' into 4.7-s60axis2010-07-212-1/+39
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/sql/drivers/drivers.pri
| | | * | | Fixed automatic sqlite extraction on Symbian makefile build system.axis2010-07-212-1/+39
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we cannot extract to the epocroot (it is considered R/O), we extract the header and the dso to the temporary build directories and include them from there. RevBy: Trust me
| | * | | Do not crash if addrinfo signal does not contain ip address information.Jukka Rissanen2010-07-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes: NB#176643 - Segmentation fault occurs while using networking Reviewed-by: Adrian Constantin
| | * | | Merge branch '4.7' of ../oslo-staging-1 into 4.7Lorn Potter2010-07-1431-3915/+85
| | |\ \ \
| | | * \ \ Fixing merge conflicts.Martin Smith2010-07-132-17/+21
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7 Conflicts: doc/src/declarative/advtutorial.qdoc src/declarative/graphicsitems/qdeclarativeloader.cpp src/declarative/graphicsitems/qdeclarativetextedit.cpp src/declarative/qml/qdeclarativeengine.cpp src/declarative/util/qdeclarativexmllistmodel.cpp
| | | * | | Consolidate sql driver configuration redundancyMark Brand2010-07-079-102/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously sql driver recipes each appeared in both the plugin pro file and src/sql/drivers/drivers.pri for building into QtSql. Split driver recipes into shared pri files. Also split bundled 3rd party sqlite code recipe into a shared pri. Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | * | | Fixed whitespace formattingMark Brand2010-07-079-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | | Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7Lorn Potter2010-06-301-22/+33
| | |\ \ \ \
| | * | | | | make sure ap's are removed when the device is removedLorn Potter2010-06-303-28/+74
| | | | | | |
| | * | | | | Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7Lorn Potter2010-06-281-126/+124
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7Lorn Potter2010-06-277-241/+497
| | |\ \ \ \ \ \
| | * | | | | | | fix actions regarding removal of connman. make tests pass on desktopLorn Potter2010-06-272-81/+91
| | | | | | | | |
| | * | | | | | | Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7Lorn Potter2010-06-211-2/+12
| | |\ \ \ \ \ \ \
| | * | | | | | | | fix ghost ap issue, and dont block on connectLorn Potter2010-06-212-82/+235
| | | | | | | | | |
| | * | | | | | | | Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7Lorn Potter2010-06-1714-88/+131
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | initial connman bearer backend.Lorn Potter2010-06-077-1/+2324
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | still needs work, debugging, additional threading support, and probably refactoring. This includes a connman dbus service wrapper that has more functionality than is needed by the bearer backend but still missing some 'set' functionality for a complete connman wrapper. Developed with wifi/desktop on 'lucid' kubuntu, using the connman available at http://ppa.launchpad.net/indicator-network-developers/ppa/ubuntu
* | | | | | | | | | | Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-07-2115-160/+173
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |