summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Fix typos found by the spellchecking autotestPaul Olav Tvete2010-10-282-3/+3
|
* Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-272-4/+14
|\ | | | | | | | | Conflicts: src/corelib/global/qglobal.h
| * Merge branch 'macMakefileBuildSupport' into master.Liang Qi2010-10-262-4/+14
| |\
| | * Fixed library and header definitions for Symbian builds on Linux.axis2010-10-211-2/+6
| | | | | | | | | | | | | | | | | | | | | RevBy: Gareth Stockwell ...who was right to point out that the is_using_gnupoc scheme is terrible, so now we have a task for getting rid of that, QTBUG-14361.
| | * Changed various qmake constructs to support Windows.axis2010-10-211-2/+8
| | | | | | | | | | | | RevBy: Thomas Zander
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2618-275/+868
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp
| * | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-266-41/+307
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-256-41/+307
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Simplify calculation of center point and scale for PinchRecongizer Doc: Fixing typo QtDFB: Make transparent windows behave better For meego graphics system, use floyd-steinberg dithering when converting to 16bit. Added support for blitting to native child widgets in GL window surface.
| | | * | Doc: Fixing typoSergio Ahumada2010-10-251-3/+3
| | | | |
| | | * | QtDFB: Make transparent windows behave betterAnders Bakken2010-10-223-17/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows with Qt::WA_NoSystemBackground should clear to transparent in beginPaint. Merge-request: 882 Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | * | For meego graphics system, use floyd-steinberg dithering when converting to ↵Michael Dominic K2010-10-223-24/+278
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 16bit. Merge-request: 2496 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-251-3/+3
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-10-251-3/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: Fixed case of a library file name to enable MinGW builds on Fedora. Doc: Made Qt::TextLongestVariant internal again. Doc: Fixed minor documentation issues. Doc: Reorganized the platform and compiler notes pages. Doc: Removed non-ASCII characters and reformatted the text. Doc: Fixed documentation style and qdoc warnings. Doc: Fixed qdoc warnings. Doc: Fixed qdoc warnings. Doc: Fixed snippet reference for the Getting Started QML guide. Doc: Fixed warnings caused by an earlier change. Made docs consistent. Doc: Fixed warnings caused by an earlier change. Made docs consistent. Doc: Renamed an external reference to work around an auto-linking issue. Doc: Fixed qdoc warnings. Doc: Fixed links to the online BSD license information. Doc: Fixed qdoc warnings. Doc: Re-added a link to the Qt site related to testing tools. Doc: Marked some new properties as internal for now. Doc: Renamed a project file. Doc: Added missing examples and snippets.
| | | * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-228-239/+412
| | | |\ \ \ | | | | |/ /
| | | * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-211-2/+3
| | | |\ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-208-30/+180
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-147-0/+310
| | | |\ \ \ \ \
| | | * | | | | | Doc: Fixed qdoc warnings.David Boddie2010-10-071-3/+3
| | | | | | | | |
| * | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-252-2/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Fixed many spelling errors.Rohan McGovern2010-10-252-2/+2
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-2511-259/+541
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/snake/snake.qml qmake/generators/symbian/symbiancommon.cpp src/network/access/qnetworkaccessmanager.cpp src/s60installs/s60installs.pro tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| | * | | | | | Fall back to Qt for loading images with DICAPS_COLORKEY.Anders Bakken2010-10-211-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 844 Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | * | | | | | Adding ::scroll capabilities to live pixmaps.Michael Dominic K2010-10-212-3/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2494 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | | | | | Major refactoring: creating a new QPixmapData subclass for live textures.Michael Dominic K2010-10-217-232/+334
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving code from qmeegopixmapdata there. Merge-request: 2494 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | | | | In meego, support Format_RGB32 too for eglShared images.Michael Dominic K2010-10-211-2/+3
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | Merge-request: 2493 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | | | In meego graphics system remove a redundant check.Michael Dominic K2010-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 864 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | | | Removing glFinish calls in eglSharedImage code. Not needed anymore.Michael Dominic K2010-10-181-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (was a driver bug after all). Merge-request: 864 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | | | ::copy on the QMeeGoPixmapData creates a raster-backed pixmap.Michael Dominic K2010-10-185-2/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was required to implement a new subclass to make this happen. Merge-request: 863 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-153-13/+55
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (26 commits) Disable the unified toolbar before entering QWorkspace: fix hardcoded min size overwriting the real min size Fix tst_moduleqt47::accidentalImport tst_qcompleter: Fix the QTBUG_14292_filesystem test on X11 tst_qcompleter.cpp: fix test on mac. Fixed autotest that was missing focus on Windows QGraphicsLayoutItem - user set sizes should always override, even if there's a constraint QGridLayoutEngine - Rework height-for-width support so that row/col spanning works Revert "Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine"" Fixed statement about const_iterator and some whitespace fixes. Adjust the parent index for the itemsMoved call. Correctly handle both 16bit and 32bit live pixmaps in meego graphics system. Correctly remove the egl alpha surface flags in meego graphics system. Proper dither & proper alpha checking. In meego graphics system, use always 16bit textures. QCompleter: do not auto complete when directory is changed. tst_qcompleter: Add a test for QFileSystemModel Doc: adjusting the search field width Doc - remove disclaimer Added the default format of QTime::toString(). ...
| | * | | | | Fix User 46 Panic in bearer management on Symbian.Aaron McCarthy2010-10-131-7/+3
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The active object made a request before it was set as active. Task-number: QT-3996 Written-by: Perttu Pohjonen <perttu.pohjonen@nokia.com>
| * | | | | Merge commit '9f766c977a329c84023a15fc66f52d26ff03447b^' into qt-master-from-4.7Olivier Goffart2010-10-253-13/+55
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Correctly handle both 16bit and 32bit live pixmaps in meego graphics system.Michael Dominic K2010-10-132-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 856 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | | | Correctly remove the egl alpha surface flags in meego graphics system.Michael Dominic K2010-10-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 856 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | | | Proper dither & proper alpha checking.Michael Dominic K2010-10-131-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 854 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | | | In meego graphics system, use always 16bit textures.Michael Dominic K2010-10-131-8/+40
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use GL_RGB16 for no-alpha images and RGBA4 for alpha images. Merge-request: 854 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | | enums are defined as typedefs for Windows Embedded 7Oliver Gutbrod2010-10-201-0/+3
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2210-22/+344
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_win.cpp src/gui/kernel/qwidget.cpp src/gui/text/qfontengine_ft.cpp
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-151-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Adds support for sun-libiconv to plugins.pro
| | * | | | Adds support for sun-libiconv to plugins.proMartin Pejcoch2010-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some Solaris machines are using sun-libiconv, which can also be used to compile the plugins. Task-number: QTBUG-14176 Reviewed-by: Thiago
| * | | | | Don't use 'id' as variable name, it has special meaning in Objctive-CTor Arne Vestbø2010-10-151-2/+2
| |/ / / / | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-121-0/+8
| |\ \ \ \ | | |/ / /
| | * | | Add support for Qt::WA_TranslucentBackground with OpenVG on Symbian^3Jason Barron2010-10-121-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | S^3 does not have a client side API to support semi-transparent EGL surfaces so if this flag is enabled for a particular widget, then we should return a raster surface instead of a VG surface. Raster surfaces can still be semi-transparent but will be slower to render to. Task-number: QTBUG-14400 Reviewed-by: Jani Hautakangas Reviewed-by: Gareth Stockwell Reviewed-by: Sami Merila
| * | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-086-0/+302
| |\ \ \ \ | | |/ / /
| | * | | Live texture updates to meegographicssystem plugin.Michael Dominic K2010-10-076-0/+302
| | |/ / | | | | | | | | | | | | | | | | Merge-request: 848 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-071-19/+31
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msbuild_objectmodel.h qmake/generators/win32/msvc_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/arch/qatomic_arm.h tests/auto/qglthreads/tst_qglthreads.cpp
| | * | Added qmake check for presence of RHttpDownloadMgr headerGareth Stockwell2010-10-031-22/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | downloadmgrclient.h is not found on S^4 baselines, causing a build failure. This commit is a temporary workaround, which disables progressive download support if the header is not found. The correct solution is to determine whether the RHttpDownloadMgr definition has moved, and if so, to modify the .pro file to include the new path. Task-number: QTBUG-10769 Reviewed-by: TrustMe
| | * | Progressive download in Phonon MMF backend: added download managersGareth Stockwell2010-10-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a Download class which uses the RHttpDownloadMgr API to download a media clip over HTTP. Task-number: QTBUG-10769 Reviewed-by: Derick Hawcroft
* | | | Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-10-2216-0/+1425
|\ \ \ \
| * | | | Lighthouse: initial COCOA pluginJørgen Lind2010-10-2016-0/+1425
| | | | |
| * | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-10-0542-64/+3944
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | Conflicts: src/gui/painting/qpdf.cpp
generated by cgit v0.12 at 2025-01-25 02:14:07 (GMT)