summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Fixed several compile and deployment issues in the mmf phonon plugin.axis2010-12-231-1/+1
| | | | | | | | | RevBy: Trust me Conflicts: src/plugins/phonon/mmf/mmf.pro src/s60installs/s60installs.pro
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-204-15/+97
|\ | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/plugins/phonon/mmf/mmf.pro src/s60installs/s60installs.pro tests/auto/qapplication/test/test.pro tests/auto/qgraphicsview/tst_qgraphicsview.cpp
| * Quiet unused parameter warnings.Aaron McCarthy2010-12-201-0/+3
| |
| * Fix possible null pointer dereference.Aaron McCarthy2010-12-151-3/+5
| | | | | | | | | | | | | | When parsing a new connection an access point with the same SSID may not have been previously seen. Task-number: QTBUG-15276
| * Ensure that DBus is connected before all uses.Aaron McCarthy2010-12-152-11/+88
| | | | | | | | | | | | | | | | | | | | | | | | In early system startup applications may try to use ICD before it is contactable. Ensure that the connection to ICD is established before all calls are made. If ICD is still not contactable QDBusServiceWatcher is used to monitor registration of the com.nokia.icd2 address and reconnection is attempted once ICD is started. Task-number: Maemo 199755
| * Fixed several compile and deployment issues in the mmf phonon plugin.axis2010-12-141-2/+2
| | | | | | | | RevBy: Trust me
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-133-7/+17
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/gui/graphicsview/qgraphicslayout.cpp src/gui/text/qfontengine_s60.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qwindowsurface_gl.cpp src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-082-5/+15
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Check Qt::WA_TranslucentBackground instead of custom widget property. New translucency API for the meego graphics system. Support for 'qglTranslucent' in QGLWindowSurface. Use a different dither distribution matrix + a bit of rand. Fixed cubic bezier rendering bug in qgrayraster. Revert "qgrayraster: Speed up rendering of small cubic splines." Fix QWingedEdge memory usage issue Make sure QMeeGoGraphicsSystem::setTranslucent can't be called if surface already created. Prevent always deep-copying in QPixmap::toImage() for raster pixmaps. Fix text disappearing on GL when RGB-path is taken (no transformation) Fix for GCC on Windows x64. Fix crash in QTextDocument::markContentsDirty Make sure to do a deep copy of a QImage when it's being painted on.
| | * Use a different dither distribution matrix + a bit of rand.Michael Dominic K2010-12-081-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | Also don't dither on edges. Improves dithering over tiles/scaled smooth gradients. Merge-request: 971 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * Make sure QMeeGoGraphicsSystem::setTranslucent can't be called if surface ↵Michael Dominic K2010-12-081-1/+8
| | | | | | | | | | | | | | | | | | | | | already created. Merge-request: 967 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | Proxy mode was not correctly checked.Jukka Rissanen2010-12-081-2/+2
| |/ | | | | | | Fixes: NB#208617 - QtProxyFactory does not return correct (any) proxy data
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-104-64/+35
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Proposed fix for QTBUG-10499 remove useless overload simplify polling code a bit promote QNetworkConfigurationManager::updateConfigurations() to a slot simplify waitForOpened() fix CV-qualifiers for some members minor clean-ups and styling fixes
| * | minor clean-ups and styling fixesKonstantin Ritt2010-12-104-64/+35
| | | | | | | | | | | | | | | Merge-request: 899 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-064-6/+16
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | Conflicts: configure qmake/generators/win32/msbuild_objectmodel.cpp src/gui/image/qpnghandler.cpp src/network/access/qnetworkaccessdatabackend.cpp src/opengl/qgl_x11egl.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * Fix proxy reading from gconf so that it is only done once / session.Jukka Rissanen2010-12-062-4/+15
| | | | | | | | | | | | | | Fixes: NB#194509 - Network access from a Qt app makes dbus daemon consume tons of cpu Task-number: QT-4220
| * Remove the FIXME, it's fixedThiago Macieira2010-11-281-1/+1
| |
| * Fix warning about uninitialised varibale.Thiago Macieira2010-11-281-0/+1
| | | | | | | | | | This variable cannot be dereferenced when it's zero, but let's silence the compiler warning (GCC 4.4 on ARM).
| * Fix warnings related to unused variables.Thiago Macieira2010-11-261-2/+0
| | | | | | | | | | | | | | Just add some Q_UNUSED for parameters or remove the variable we don't need for the others. Reviewed-by: Trust Me
* | Fix spelling mistake in QEGLPlatformcontextJørgen Lind2010-12-014-4/+4
| | | | | | | | | | | | Autocompletion and a hint of dyslexia made me not see this before :) Reviewed-by: paul
* | Merge remote branch 'origin/master' into lighthouse-masterJørgen Lind2010-11-298-33/+68
|\ \
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-255-4/+6
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp src/corelib/global/qglobal.h src/gui/kernel/qwidget_p.h src/gui/painting/qtextureglyphcache.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h src/plugins/qpluginbase.pri src/qbase.pri tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp tests/auto/qthread/tst_qthread.cpp tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-241-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (27 commits) Use parent class function to generate Makefile headers in Symbian Fix spaces Fix QPixmap::fromImage() in the OpenVG pixmap backend. Native color dialog on symbian Fix non-stroked filled paths in OpenVG paint engine. Fix symbian-mmp.conf include path Fix a build break when namespace is defined Fixed namespace issues related to epocroot.cpp Corrected ASCII comparison and removed extra braces Add symbian scope for qfiledialog_symbian.cpp Resolve EPOCROOT in qt.conf using same logic as in .pro Make epocroot resolving compatible with more build environments Fix for QtOpenGL RVCT4 compilation error Removed extra cpp and done changes based on comments Correct flags for Symbian file dialogs Fix for WServ 64 crash on Symbian. Use include(original mkspec) instead of copying of mkspec to default Fixed code style of d92cbfc5, reported by git push. Switched qdesktopservices to use SchemeHandler for Symbian^3 and later. Removed unnecessary Q_OS_SYMBIAN flags from qdesktopservices_s60.cpp. ...
| | | * Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-231-0/+2
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-191-1/+1
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (21 commits) Fixed handling of QInputMethodEvents with nonzero replacementLength. Fixed namespace issues related to epocroot.cpp Corrected ASCII comparison and removed extra braces Add symbian scope for qfiledialog_symbian.cpp Resolve EPOCROOT in qt.conf using same logic as in .pro Make epocroot resolving compatible with more build environments Fix for QtOpenGL RVCT4 compilation error Removed extra cpp and done changes based on comments Correct flags for Symbian file dialogs Fix for WServ 64 crash on Symbian. Use include(original mkspec) instead of copying of mkspec to default Fixed code style of d92cbfc5, reported by git push. Switched qdesktopservices to use SchemeHandler for Symbian^3 and later. Removed unnecessary Q_OS_SYMBIAN flags from qdesktopservices_s60.cpp. Documented usage of dialogs on Symbian Native file dialog on Symbian^3 Add Location as self signable capability in patch_capabilities.pl Localize .loc and .pkg content based on TRANSLATIONS Bump Qt version to 4.7.2. SSL: Fix for systemCaCertificates being called first on symbian ...
| | | | * \ Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-184-31/+64
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| | | | * | | Bump Qt version to 4.7.2.Jason McDonald2010-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-221-0/+2
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-191-0/+2
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix compilation with Sun Studio 12.1. Compile with QT_NO_PROXYSCREEN. silence compiler warnings Don't let posted events starve native dialogs (regression)
| | | | * | | Compile with QT_NO_PROXYSCREEN.Sam Magnuson2010-11-191-0/+2
| | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | Merge-request: 931 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-192-2/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | Doc: Fixing typoSergio Ahumada2010-11-162-2/+2
| | | |/ /
| | * | | Tactile Feedback plugin is not compiled in latest Sym^3 RnD envsSami Merila2010-11-182-2/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to somewhat questionable .pro-file flagging, the plugin is not currently compiled at all for latest Sym^3 environments. Flagging is now more bulletproof (not 3.1 & not 3.2), so even if the upcoming platform versions change, this should work in the future. Task-number: QTBUG-15428 Reviewed-by: Miikka Heikkinen
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-194-31/+64
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/gui/kernel/qgesturemanager.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf Changes in qmake/generators/win32/msvc_objectmodel.cpp come from commit 4ba3dadcae97bfde6216c32cfa339f8f0e0253c7
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Perttu Pohjonen2010-11-151-3/+3
| | |\ \
| | | * | Fix for KERN-EXEC 0 caused by QNetworkAccessManager::getVille Pernu2010-11-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QT-4155 bug. Canceling Network Session before canceling connection notifier notifications causes a call to an invalid RConnection instance. Fix: CanceL Network session after canceling notifications.
| | | * | Minor adjustments to merge-request 915Donald Carr2010-11-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix minor stylistic issue raised by Oswald Removed duplicate sourceSurface pointer introduced by sibling merge request
| | | * | Implement brush transformations for directfb.Sam Magnuson2010-11-121-14/+28
| | | |/ | | | | | | | | | | | | | | | | | | | | Merge-request: 915 Reviewed-by: Donald Carr <donald.carr@nokia.com> (cherry picked from commit b62079cf17044e09999eb1808788926ea921fb05)
| | * | Fix for E32User-CBASE 46 Panic when using CActiveSchedulerWaitPerttu Pohjonen2010-11-152-14/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing the initial problem of this error opened up a possibility to start a new WLAN scan while there was one still ongoing. This caused a crash. Task-number: QT-3996
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-111-14/+28
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Minor adjustments to merge-request 915 Implement brush transformations for directfb. Add FreeBSD's certificate bundle to the certificates list. SSL internals: upon error, read all errors from OpenSSL Added an example for QTest::touchEvent to the documentation. Push and pop the thread-default context for the current thread Fix compilation by s/intptr_t/quintptr/
| | | * Minor adjustments to merge-request 915Donald Carr2010-11-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fix minor stylistic issue raised by Oswald Removed duplicate sourceSurface pointer introduced by sibling merge request
| | | * Implement brush transformations for directfb.Sam Magnuson2010-11-111-14/+28
| | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 915 Reviewed-by: Donald Carr <donald.carr@nokia.com> (cherry picked from commit b62079cf17044e09999eb1808788926ea921fb05)
* | | | Make the openKODE use the new eventloopintegration api.Jørgen Lind2010-11-264-14/+24
| | | | | | | | | | | | | | | | And also make it work with the new GL functionality in Lighthouse
* | | | Make QtOpenGL use shared contextexts on LighthouseJørgen Lind2010-11-261-1/+3
| | | |
* | | | Lighthouse: Fix QGLContext::currentContext for systems with limitedJørgen Lind2010-11-248-32/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resources. The example plugins EGLFS uses only 1 native context. Make sure that we only use this 1 context, and that we dont wrap it in many different QPlatformGLContexts or QGLContexts instanses. This change also removes the QPlatformWindow link which was made in the initial QPlatformGLContext change. Lighthouse has to support situations where a context isnt bound to a QPlatformWindow. Reviewed-by: gunnar
* | | | Make EglFS plugin compile after changes to QPlatformEGLContextGunnar Sletta2010-11-231-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Jørgen Lind
* | | | Lighthouse: move the currentContext functionality to QPlatformGLContextJørgen Lind2010-11-225-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means the threading functionality has been delegated down to QPlatformGLContext. However, it is still possible to use QGLContext::currentContext to retrieve the QGLContext. This so that QGLFunctions, QGLShaderProgram etc can be used without a QGLWidget. Reviewed-by: paul
* | | | Lighthouse: Make sure that we call QPlatformWindow::setVisibleJørgen Lind2010-11-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | on native child widgets. Reviewed-by: paul
* | | | Lighthouse: using QFont enums when possible in QPlatformFontdatabaseJørgen Lind2010-11-222-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | also, make it possible to register fonts in QPlatformDatabases with a null handle Reviewed-by: paul
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-11-1925-211/+491
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm src/gui/text/qfontengine_p.h
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-1214-100/+280
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure doc/src/snippets/code/doc_src_qmake-manual.qdoc mkspecs/features/symbian/application_icon.prf mkspecs/features/symbian/default_post.prf mkspecs/features/symbian/symbian_building.prf qmake/generators/symbian/initprojectdeploy_symbian.cpp src/multimedia/audio/audio.pri src/network/access/qnetworkaccessmanager.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl_p.h src/plugins/bearer/corewlan/qcorewlanengine.mm src/plugins/phonon/mmf/mmf.pro tests/auto/qscriptvalue/tst_qscriptvalue.cpp tests/auto/qscriptvalue/tst_qscriptvalue.h tools/qdoc3/doc/qdoc-manual.qdocconf
generated by cgit v0.12 at 2025-01-15 09:57:20 (GMT)