summaryrefslogtreecommitdiffstats
path: root/dist
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Mention Lighthouse in the changes file.Paul Olav Tvete2011-09-151-0/+6
| | |
* | | Changelog: add waylandwindowmanager integration changesLasse Holmstedt2011-09-151-0/+2
| | |
* | | My 4.8.0 changesEskil Abrahamsen Blomfeldt2011-09-151-0/+4
|/ / | | | | | | Add the rest of my changes to the change log.
* | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-231-0/+304
|\ \ | |/ |/| | | | | Conflicts: doc/src/index.qdoc
| * Update 4.7.4 changesTimo Turunen2011-08-191-0/+304
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-07-191-0/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add docs for QSqlRelationalTableModel::JoinMode Fixed behavior on NULL foreign keys update change file Forward port qt modifications for sqlite3.c Forward port the vxworks changes Update sqlite to 3.7.7.1
| * | update change fileCharles Yin2011-07-191-0/+3
| | | | | | | | | | | | Change-Id: I3c7cecf1f099e2868653c041d88a4208b77c5748
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-07-141-1/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: Added Solaris build fix to the changes file.
| * | Added Solaris build fix to the changes file.Martin Pejcoch2011-07-141-1/+2
| | |
* | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-081-5/+22
|\ \ \
| * \ \ Merge remote branch 'mainline/4.8' into stagingJiang Jiang2011-07-081-0/+18
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: dist/changes-4.8.0
| * | | Add font related changes in 4.8 into changesJiang Jiang2011-07-041-3/+18
| | | | | | | | | | | | | | | | Reviewed-by: Eskil
| * | | update 4.8.0 changes fileaavit2011-07-011-1/+4
| | | |
* | | | My changes for 4.8.0Jan-Arve Saether2011-07-051-0/+3
| |/ / |/| |
* | | Update changelog with Accessibility fixes.Frederik Gladhorn2011-07-041-0/+11
| | |
* | | Changelog: Add mention of qmlplugindump.Christian Kamm2011-07-041-0/+3
| | |
* | | changelogHarald Fernengel2011-07-011-0/+5
|/ /
* | Update 4.8.0 changes fileShane Kearns2011-06-301-1/+15
| |
* | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-06-241-0/+2
|\ \
| * | changelogRitt Konstantin2011-06-211-0/+2
| | | | | | | | | | | | | | | Merge-request: 1259 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* | | my changelog for 4.8.0Peter Hartmann2011-06-231-0/+16
|/ /
* | Added some of my Qt 4.8 changes to the changelogOlivier Goffart2011-05-261-0/+22
| | | | | | | | | | | | | | Change-Id: I8913c88e5bd68145e0587d51ee9896fd5d21054a Reviewed-on: http://codereview.qt.nokia.com/140 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> (cherry picked from commit bc7ea289ea84dcff22aeea78c01a5447ccf076f7)
* | Changelog: Qt Designer 4.8Friedemann Kleint2011-04-281-2/+10
| |
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-311-0/+12
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/example-slideswitch.qdoc doc/src/development/qmake-manual.qdoc doc/src/snippets/code/doc_src_qmake-manual.pro doc/src/snippets/code/doc_src_qtscript.qdoc src/corelib/animation/qabstractanimation.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qdir/qdir.pro tests/auto/qsslsocket/tst_qsslsocket.cpp tools/qdoc3/doc/qdoc-manual.qdocconf
| * Update changes for 4.7.3Timo Turunen2011-03-281-0/+12
| | | | | | | | Reviewed-by: Trust Me
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-241-0/+47
|\ \ | |/ | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp
| * Changes for 4.7.3Timo Turunen2011-03-221-0/+47
| | | | | | | | Reviewed-by: Trust Me
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-221-0/+31
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/positioners/layoutdirection/layoutdirection.qml src/corelib/global/qglobal.h src/plugins/qpluginbase.pri src/qbase.pri src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def 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_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-211-0/+31
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Change the pooled QGLPixmapData to be backed by QVolatileImage. Started changes-4.7.4 file Changed s60 style not to rely on QPixmapData::toNativeType(). Add missing bitmap locking to QVGPixmapData::fromNativeType. Prepare fromSymbianCFbsBitmap autotest for 16 bpp format.
| | * Started changes-4.7.4 fileEckhart Koppen2011-03-211-0/+31
| | | | | | | | | | | | | | | | | | Placeholder file created to allow package creation Reviewed-by: TrustMe
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-111-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * | Bump Qt version to 4.7.3Timo Turunen2011-03-091-0/+0
| |/ | | | | | | Reviewed-by: Trust Me
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-231-133/+138
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac.mm src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def src/testlib/qtestcase.cpp
| * Add selected P1 tasks to changes file.Jason McDonald2011-02-211-133/+138
| | | | | | | | Reviewed-by: Trust Me
| * Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-02-101-4/+26
| |\
* | \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-111-4/+24
|\ \ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-101-4/+24
| |\ \ \ | | |/ / | | | / | | |/ | |/| | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: My 4.7.2 changes
| | * My 4.7.2 changesKent Hansen2011-02-101-4/+24
| | |
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-101-4/+26
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc mkspecs/symbian-gcce/qmake.conf qmake/project.cpp src/corelib/global/qnamespace.qdoc src/declarative/graphicsitems/qdeclarativetext.cpp src/gui/text/qtextdocumentlayout.cpp src/gui/text/qtextdocumentlayout_p.h tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp tests/auto/networkselftest/networkselftest.pro tests/auto/qscriptengine/tst_qscriptengine.cpp tools/designer/src/components/signalsloteditor/signalslot_utils.cpp tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp 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 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 System2011-02-091-4/+26
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: 4.7.2 changes Change paging attributes for Symbian binaries Fix build failure Fix regression in creating mkspecs/default Changes for 4.7.2 Recreate Symbian raster backing store when WA_TranslucentBackground set
| | * 4.7.2 changesIain2011-02-091-0/+16
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * Changes for 4.7.2Gareth Stockwell2011-02-091-4/+10
| | | | | | | | | | | | Reviewed-by: Jani Hautakangas
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-041-2/+60
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/samegame/SamegameCore/samegame.js mkspecs/features/symbian/default_post.prf src/declarative/qml/qdeclarativeengine.cpp src/gui/text/qtextdocumentlayout.cpp src/plugins/plugins.pro src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def src/s60installs/s60installs.pro tests/auto/declarative/declarative.pro tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp tests/auto/declarative/qmlvisual/qmlvisual.pro
| * | My changes 4.7.2Miikka Heikkinen2011-02-031-2/+60
| |/ | | | | | | Reviewed-by: TrustMe
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-251-0/+4
|\ \ | |/ | | | | | | | | Conflicts: configure src/network/bearer/bearer.pri
| * Implementation of QNetworkProxyFactory::systemProxyForQuery() for SymbianJeremy Katz2011-01-171-0/+4
| | | | | | | | | | | | | | | | This implementation replaces the default do-nothing version, querying the device's commsdat for appropriate entries. Task-number: QTBUG-13857 Reviewed by: Jeremy Katz et al.
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-0/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Allow IAP to be selected in Phonon MMF backendRuth Sadler2011-01-111-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Phonon API does not provide any way for the client to specify which network connection should be used for streaming playback. If the application already has a connection open, using a bearer other than the default (e.g. using WiFi when the device default is GPRS), it may be desirable to use it for streaming, rather than allowing the Phonon backend to open a second connection on the default bearer. This patch adds a custom property on the Phonon::MediaObject, called InternetAccessPointName. The client can specify the IAP which Phonon should use by setting this property. Note that support for this property is only provided in the Phonon MMF backend. Task-number: QTBUG-11436 Reviewed-by: Gareth Stockwell
* | Added warning if <QGLFunctions> is included when GLEW is present.Samuel Rødal2011-01-051-0/+2
| | | | | | | | | | | | GLEW can not be used in combination with <QGLFunctions>. Reviewed-by: Eskil Abrahamsen Blomfeldt
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-251-2/+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
generated by cgit v0.12 at 2024-12-02 04:51:36 (GMT)