summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-222-17/+3
|\ | | | | | | | | | | Conflicts: src/gui/painting/qtextureglyphcache_p.h src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-221-14/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: apply msvc flags to wince too fix qt static build on wince fix build with QT_NO_GESTURES qmake: fix quoting of moc calls Use regparm(3) for ICC too, otherwise it's an ABI mismatch in QChar Regenerate the Unicode tables after updates to the generator tool Compile in C++0x mode remove extra includes minor clean-ups minor improvements for data parsers tiny clean-up for generated data move QUnicodeTables:: script() and lineBreakClass() implementations make lupdate test less fragile Enable building Qt/Webkit with debug symbols Add breakpad support
| | * fix qt static build on winceRomain Pokrzywka2010-09-211-14/+0
| | | | | | | | | | | | Reviewed-by: mariusso
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Jason McDonald2010-09-211-3/+3
| |\ \
| | * | Qt headers must be included before X11 headersBenjamin Poulain2010-09-211-3/+3
| | |/ | | | | | | | | | | | | | | | | | | X11 symbols are conflicting with some of the Qt ones. Qt headers needs to be included before the X11 ones in order to compile on Maemo. Reviewed-by: Samuel Rødal
| * | Bump version to 4.7.1.Jason McDonald2010-09-211-1/+1
| |/ | | | | | | Reviewed-by: Trust Me
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-2123-34/+1005
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp
| * Fixed compilation of MeeGo graphics system without eglext.hSamuel Rødal2010-09-171-1/+0
| | | | | | | | | | | | We don't rely on this header, so there's no need to include it. Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-173-5/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Export qt_directfb_.* functions in plugin as well Added autotest for QPixmap::size() with null pixmaps. Update Symbian def files. QGraphicsItem::childrenBoundingRect behavior breaks QGraphicsEffect::sourceBoundingRect(). Wrong bounding rect returned by QGraphicsEffect::boundingRect(). Compile on Mac Ensure building of WebKit and QtConcurrent are disabled with SunCC.
| | * Export qt_directfb_.* functions in plugin as wellAnders Bakken2010-09-173-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These functions can be a big help in debugging rendering errors in an application and can even be handy to use for real functionality. While it requires the app to explicitly link to the plugin (when compiling with -plugin-gfx-directfb this is still much better than not exporting them). Since this was the only use-case for QT_DIRECTFB_PLUGIN it's probably better to take that define out. Merge-request: 2470 Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | Remove pre-Symbian3 plugins from Symbian3 and later buildsMiikka Heikkinen2010-09-173-6/+17
| |/ | | | | | | | | | | | | | | | | Symbian3 and later builds are not compatible with pre-Symbian3 phones anyway, so no need to build and deploy older version plugins when building for Symbian3 or later. Task-number: QT-3949 Reviewed-by: Janne Koskinen
| * Make SourceOver work properly in Qt/DirectFBAnders Bakken2010-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt and DirectFB have different definitions of SourceOver. In DirectFB it's defined as this: /* pixel = (source * fs + destination * fd), sa = source alpha, da = destination alpha */ DSPD_SRC_OVER = 3, /* fs: 1.0 fd: 1.0-sa */ In other words, the source pixels are not multiplied by the alpha and this leads to issues with RGBA values like 255, 0, 0, 0. The composition mode that in DirectFB that maps onto Qt's CompositionMode_SourceOver is DSPD_NONE, defined like this: DSPD_NONE = 0, /* fs: sa fd: 1.0-sa (defaults) */ Merge-request: 807 Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * Check S60_VERSION instead of existence of certain files in bearer pluginMiikka Heikkinen2010-09-162-15/+15
| | | | | | | | | | | | | | | | | | Checking for existence of files does not work in clean platform builds, so check the S60_VERSION instead, which can be explicitly set by those builds to correct value. Task-number: QT-3949 Reviewed-by: axis
| * Fixed missing background for regular Qt applications with MeeGo system.Samuel Rødal2010-09-141-1/+0
| | | | | | | | | | | | | | | | Setting NoSystemBackground means that top-level widget backgrounds don't get painted any more. Another work-around must be found to prevent flickering. Reviewed-by: Gunnar Sletta
| * Don't add generic subdirs project twice.Aaron McCarthy2010-09-131-3/+3
| | | | | | | | Task-number: QTBUG-13519
| * Remove debug, quiet warnings.Aaron McCarthy2010-09-131-2/+0
| |
| * Fix memory leaks and valgrind errors.Aaron McCarthy2010-09-131-2/+9
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-101-0/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Bearer management: Fix compilation with namespace. fetch next token after class definition opening delay next token fetching when opening namespace don't let operator overloads confuse us don't try to show source when no locations are given Implement a private API for setting title widgets Fix the bug for QSettings on Windows, to store qint32/quint32, qint64/quint64 in Windows registry. fix CRLF Added private API to install an x11EventFilter NTLM code: Save domain in different variable Update the error handling of invalid hostnames in QUrl. Remove unsupported code from qobject.h for MSVC < .NET 2003 Properly implement qobject_cast for const pointers. Revert "Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page"
| | * Bearer management: Fix compilation with namespace.Christian Kandeler2010-09-101-0/+2
| | |
| * | Use QFactoryLoader to ensure we get the correct graphics system plugin.Samuel Rødal2010-09-101-8/+8
| | | | | | | | | | | | Also, this prevents hard-coding the path to the meego plugin.
| * | Updated license headers for meego graphics system.Samuel Rødal2010-09-108-56/+272
| | |
| * | Fixed compilation and API of meego graphics system.Samuel Rødal2010-09-1010-148/+153
| | |
| * | Renamed meego graphics system files.Samuel Rødal2010-09-109-0/+0
| | |
| * | Imported meego graphics system sources.Samuel Rødal2010-09-109-0/+738
| |/ | | | | | | From http://www.gitorious.com/meego-graphics/meego-graphics
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-1012-188/+1592
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf
| * protect nil dictionary from release.Lorn Potter2010-09-031-38/+47
| | | | | | | | Task-number: QTBUG-13335
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-09-034-94/+152
| |\
| | * Fix potential KERN-EXEC 0 on Symbian.Aaron McCarthy2010-09-021-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | SymbianEngine::updateConfigurationsL cannot be called from a non-main thread as it uses Symbian resources not shared between threads. Task-number: QTBUG-13064
| | * Revert "Restore default if to system default on session close."Aaron McCarthy2010-09-022-29/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bce4c42a3d0c7d24009230e09aa58db60db39d40. This change did not have the desired effect on Symbian versions prior to Symbian^3. Conflicts: src/plugins/bearer/symbian/qnetworksession_impl.cpp
| | * Fix EasyWLAN handling.Aaron McCarthy2010-09-014-67/+129
| | | | | | | | | | | | | | | | | | | | | RCmManager is not sharable between threads, use a function local instance instead. Task-number: QTBUG-13064
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-09-013-19/+35
| |\ \ | | |/
| * | add ofono support and fix crashesLorn Potter2010-08-247-56/+1393
| | | | | | | | | | | | | | | ofono support is needed to know what kind of cellular networks are available.
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-303-19/+35
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * | Restore default if to system default on session close.Aaron McCarthy2010-08-262-16/+32
| | | | | | | | | | | | | | | | | | | | | If setdefaultif(0) or unsetdefaultif() is called all sockets belonging to the current process are closed by OpenC. Task-number: QTBUG-12686
| * | QNetworkSession::close() method now send closed() signal while faking ↵Tomasz Bursztyka2010-08-251-3/+3
| |/ | | | | | | | | | | disconnection. Fixes: NB#185586 - QNetworkSession::closed() signal never sent when QNetworkSession::close() is called.
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-257-59/+80
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/declarative/qml/qdeclarativexmlhttprequest.cpp src/opengl/opengl.pro src/opengl/qgl_p.h src/plugins/bearer/connman/qconnmanservice_linux.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/assistant/tools/assistant/openpageswidget.h
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-201-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Changes to the index page and second level pages linking to the index page. Use Ctrl rather than Alt for switching tabs in the demo browser Doc: fixing creator bugs, removing menus and textbox in the header Update Japanese translations Ukrainian translation updated qtconfig and qvfb internationalization fixes add full width characters to ending() in linguist QFileDialog::HideNameFilterDetails breaks Cocoa QFileDIalog filter qdoc: Changed id attribute to be a UUID. just build connman and networkmanager plugins on linux
| | * just build connman and networkmanager plugins on linuxLorn Potter2010-08-201-1/+1
| | |
| * | Introduce QtOpenGL module for Symbian.Jani Hautakangas2010-08-201-0/+2
| |/ | | | | | | | | Task-number: QT-2139 Reviewed-by: Gunnar Sletta
| * cleanup and remove __FUNCTION__, which breaks build on solarisLorn Potter2010-08-192-25/+2
| | | | | | | | Task-number: QTBUG-12904
| * Fix compilation: QT_NO_TEXTSTREAMTasuku Suzuki2010-08-171-0/+2
| | | | | | | | | | Merge-request: 2450 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Mutex is already locked when private member function is called.Aaron McCarthy2010-08-161-3/+2
| | | | | | | | | | | | Conflicts: src/plugins/bearer/icd/qicdengine.cpp
| * Fixed a typo when doing a lock.Aaron McCarthy2010-08-161-2/+1
| | | | | | | | | | | | Conflicts: src/plugins/bearer/icd/qicdengine.cpp
| * The QNetworkConfigurationManager did not get the online status correctly ↵Tomasz Bursztyka2010-08-162-28/+71
| | | | | | | | | | | | | | | | | | even when there was an active connection. Fixes: NB#181984 - QNetworkConfigurationManager reports offline even when connected. Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@nokia.com> Signed-off-by: Jukka Rissanen <jukka.rissanen@nokia.com>
| * Release lock before calling into icd engine.Aaron McCarthy2010-08-161-5/+6
| |
| * Do not change the session configuration state because of changesJukka Rissanen2010-08-161-2/+0
| | | | | | | | | | | | | | in QNetworkConfigurationManager. The session state is only changed according to status messages sent by icd. Fixes: NB#182148 - QNetworkSession changes to disconnected state immediately after opening session
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-1325-513/+495
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpainter.cpp src/gui/text/qtextengine.cpp tests/auto/qimage/tst_qimage.cpp tests/auto/qpainter/tst_qpainter.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-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf
| * Clean up rasterfallback mechanism in DirectFBDonald Carr2010-08-121-103/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Being able to debug which paint operations are slow with Qt/DirectFB is currently only possible in debug builds (which defeats the purpose somewhat) or by frequent recompilation (with different defines). This patch cleans up the mechanism somewhat and makes it available in release builds as well. The overhead is a single int comparison so it really isn't a performance issue to have this code in place at all times. Reviewed-by: Anders Bakken <agbakken@gmail.com>
| * dont leak theseLorn Potter2010-08-051-0/+1
| |
| * Fix compilation with QT_NO_DBUSTasuku Suzuki2010-08-042-0/+12
| | | | | | | | | | Merge-request: 2441 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
generated by cgit v0.12 at 2024-11-01 14:44:46 (GMT)