summaryrefslogtreecommitdiffstats
path: root/dist
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Send WinIdChange event when winId is set to zeroGareth Stockwell2010-11-111-2/+6
| | | | | | | | | | | | | | | | | | | | | | This allows an observer to get a notification just before the window handle owned by a native widget is destroyed. Note that, at the point when the event is sent, the widget's internalWinId() will return the new value, but the old native window handle will not be destroyed until after the event handler is run. Task-number: QTMOBILITY-645 Reviewed-by: sroedal
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-251-0/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Update changelog Fix for QTBUG-14497 - X11 error (X_CopyRect/BadMatch) when using a translucent widge in multi-screen environment
| * | Update changelogArvid Ephraim Picciani2010-10-251-0/+2
| | |
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-252-155/+331
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | 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
| * Add skeleton changes file for Qt 4.7.2Jason McDonald2010-10-201-0/+158
| | | | | | | | Reviewed-by: Trust Me
| * Cleanup changelog for 4.7.1.Jason McDonald2010-10-151-155/+173
| |
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-121-3/+1
|\ \ | |/
| * Revert "Don't define highp/mediump/lowp if desktop GL has them"Trond Kjernåsen2010-10-121-3/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 6155050f68cc86c445552da61a5f240c16f5e2cd. The GL_ARB_ES2_compatibility extension does not mention the lowp, mediump or highp keywords. Task-number: QTBUG-14384 Reviewed-by: Samuel Reviewed-by: Prasanth
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-071-2/+48
|\ \ | |/ | | | | | | | | | | | | | | | | 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
| * My changes for 4.7.1Miikka Heikkinen2010-10-041-1/+43
| | | | | | | | Reviewed-by: TrustMe
| * Update change log.Andrew den Exter2010-10-011-1/+5
| |
* | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-041-5/+206
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/code/doc_src_qmake-manual.qdoc src/corelib/arch/symbian/arch.pri src/declarative/graphicsitems/qdeclarativeflickable.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h tests/auto/qfontmetrics/tst_qfontmetrics.cpp
| * Some 4.7.1 changes.Bjørn Erik Nilsen2010-09-301-0/+10
| |
| * Update changesJens Bache-Wiig2010-09-301-0/+2
| |
| * Add declarative changelog entries for 4.7.1Joona Petrell2010-09-301-0/+92
| | | | | | | | | | Task-number: Reviewed-by: Yann Bodson
| * connman backendLorn Potter2010-09-301-0/+1
| |
| * My changelog entries for 4.7.1Markus Goetz2010-09-291-0/+4
| |
| * updated changes-4.7.1Joerg Bornemann2010-09-291-0/+12
| |
| * Update changelogOlivier Goffart2010-09-291-0/+24
| |
| * my contributions to dist/changes-4.7.1Bradley T. Hughes2010-09-291-1/+7
| |
| * My 4.7.1 changes.Trond Kjernåsen2010-09-291-2/+11
| |
| * added my and Jan-Arve's change to changelog for 4.7.1Thierry Bastian2010-09-291-0/+11
| |
| * Changes done for 4.7.1Prasanth Ullattil2010-09-291-0/+4
| |
| * Updated changes-4.7.1Samuel Rødal2010-09-291-1/+4
| |
| * My changes.Aaron McCarthy2010-09-291-0/+2
| |
| * Added note to changes-4.7.1Zeno Albisser2010-09-281-0/+9
| | | | | | | | Reviewed-by: Frederik Gladhorn
| * Added my changes to the changelog.axis2010-09-271-0/+12
| |
* | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-09-281-3/+34
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (83 commits) Add export to QDeclarativeBasePositioner Fix assert when placing a .qml file inside $QTDIR/imports Moved the partial deployment section to qbase.pri. Made the Symbian menu close when switching native focus. Document PropertyAnimation::targets property Fix test. QHostInfo: Fix a crash when a new request is pushed while resolving. Updated WebKit to 6e15c3404d15a8ab72242152ec966e5e388161a2 Fix a compilation issue of tst_qsettings for win32-msvc. fix RSS listing example QML Debugging: Documentation fixes dist/changes: QML Debugging changes Updated changes-4.7.1. Do not set DESTDIR to the current directory Small fixes to Browser.qml Fix dependency on the plugins rule for multimedia More declarative autotests. Fix example. Assistant: Don't register internal doc when using custom collection. Assistant: Move comment to the right place. ...
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-281-3/+34
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qrasterizer.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/mainwindow.cpp
| | * dist/changes: QML Debugging changesLasse Holmstedt2010-09-241-1/+5
| | |
| | * Updated changes-4.7.1.Kim Motoyoshi Kalland2010-09-241-1/+3
| | |
| | * Changelog: 4.7.1 (uic/Designer).Friedemann Kleint2010-09-231-0/+1
| | |
| | * Update the changelog with the SSE work done for Qt 4.7.1Benjamin Poulain2010-09-231-2/+7
| | |
| | * my changes for 4.7.1Peter Hartmann2010-09-231-0/+10
| | |
| | * My Qt 4.7.1 changesEskil Abrahamsen Blomfeldt2010-09-231-0/+9
| | |
generated by cgit v0.12 at 2024-11-20 09:40:02 (GMT)