summaryrefslogtreecommitdiffstats
path: root/dist
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-08-131-0/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: (354 commits) Clean up rasterfallback mechanism in DirectFB QNAM HTTP: Fix crash related to aborted uploads Destroy the old runtime system only when existing pixmaps were migrated. Fixed autotest failure in tst_qgl::clipTest. Properly emit geometryChanged() when the position change. Make bld.inf target in Symbian mkspecs to depend on .pro file Fixed build failure Added way to destroy the share widget in the GL graphics system. QCoreApplication::library path, ensure mutex lock ordering Fix memory leak. QAudioOutput(ALSA); Fix check for available devices. qdoc: All references to -assistant and -base were removed. Only modify pixmap cache reply when protected by a mutex Fix broken example code Fix some #ifdefs to compile for a specific combination of featuress that was previously unsupported update Russian translations for Qt and tools Updated Slovenian translations for Qt 4.7 doc: The QML Qt element was missing from the documentation. Added documentation for Spectrum Analyzer demo Do not include Spectrum Analyzer demo in static builds ...
| * Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-131-0/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Update changes-4.7.0Pierre Rossi2010-08-031-0/+3
| | | | | | | | | | | | Reviewed-by: Simon Hausmann
* | | QGLFunctions - cross-platform access to ES2.0 APIRhys Weatherley2010-08-121-0/+2
|/ /
* | Remove dependency of OpenGL Utility Library (GLU).Bjørn Erik Nilsen2010-08-101-0/+4
| | | | | | | | | | | | | | | | GLU is not part of standard OpenGL and is not used internally in Qt, so we should not depend on it. Task-number: QT-12227 Reviewed-by: kim
* | Remove the use of deprecated qVariant*Olivier Goffart2010-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test directory untouched. This just apply those regexp: git grep -O"sed -i 's/qVariantValue</qvariant_cast</'" qVariantValue git grep -O"sed -i 's/qVariantSetValue(\([^&*\(),]*\), */\\1.setValue(/'" qVariantSetValue git grep -O"sed -i 's/qVariantSetValue *<\([^>]*\)> *(\([^&*\(),]*\), */\\2.setValue<\\1>(/'" qVariantSetValue git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*([^&*\(),]*)\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert git grep -O"sed -i 's/qVariantFromValue\( *[(<]\)/QVariant::fromValue\\1/'" qVariantFromValue git checkout src/corelib/kernal/qvariant* Rev-by: dev mailing list
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-07-281-12/+107
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication.cpp tests/auto/qfileinfo/tst_qfileinfo.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.qdocconf
| * update changelog for 4.7.0Peter Hartmann2010-07-261-3/+7
| |
| * My changes for 4.7.0.axis2010-07-261-2/+20
| |
| * Updated changes-4.7.0.Kim Motoyoshi Kalland2010-07-231-0/+5
| |
| * Update changes-4.7.0.Kim Motoyoshi Kalland2010-07-231-0/+3
| |
| * Some more change to the changelogOlivier Goffart2010-07-211-1/+8
| |
| * Updates changes-4.7.0Charles Yin2010-07-211-1/+7
| |
| * Updated changelog for 4.7.Yoann Lopes2010-07-201-0/+5
| |
| * My 4.7.0 changesEskil Abrahamsen Blomfeldt2010-07-201-5/+52
| | | | | | | | My 4.7.0 changes
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-012-0/+164
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: bin/syncqt src/gui/text/qtextlayout.cpp tools/assistant/tools/assistant/helpviewer_qwv.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/configure/configureapp.cpp
| * document QSslSocket::systemCaCertificates() change in changelogPeter Hartmann2010-06-171-0/+6
| | | | | | | | Reviewed-by: Zeno Albisser
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-161-0/+158
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/harfbuzz/src/harfbuzz-shaper.h src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageDecoderQt.cpp src/corelib/global/qglobal.h src/plugins/qpluginbase.pri src/qbase.pri 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/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| | * Add skeleton changes files for 4.6.4.Jason McDonald2010-06-151-0/+158
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-06-081-6/+39
|\ \ \ | |/ / | | | | | | | | | Conflicts: tools/qdoc3/test/qt-html-templates.qdocconf
| * | my changesOswald Buddenhagen2010-06-021-6/+33
| | |
| * | Add my 4.7.0 changesLeonardo Sobral Cunha2010-05-311-0/+6
| | |
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-06-012-161/+278
|\ \ \ | |/ /
| * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-271-173/+246
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/spectrum/app/engine.h demos/spectrum/app/mainwidget.h demos/spectrum/app/settingsdialog.h demos/spectrum/app/spectrograph.h demos/spectrum/app/spectrumanalyser.h demos/spectrum/app/tonegenerator.h demos/spectrum/app/tonegeneratordialog.h demos/spectrum/app/utils.h demos/spectrum/app/waveform.h tests/auto/qtextcodec/tst_qtextcodec.cpp
| | * Added some changes for 4.6.3Jens Bache-Wiig2010-05-271-0/+24
| | |
| | * My 4.6.3 changesSami Merila2010-05-261-0/+45
| | |
| | * Tidy changes file for 4.6.3.Jason McDonald2010-05-261-219/+137
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * My 4.6.3 changesMiikka Heikkinen2010-05-261-4/+84
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * My 4.6.3 changesGareth Stockwell2010-05-251-0/+6
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-251-8/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (50 commits) Dont crash when assigning the same input context twice. Fixed a typo in variable name in qlocale data generator. Fix for Norwegian and Korean languages on symbian. Remove unused function in QDBusConnectionPrivate Doc: Fixing bugs in HTML generator Updating 4.7.0 change log. Doc: Correcting style to class lists qdoc: Improved class index page. Added MSVC 2010 project files to .gitignore Fix architecture detection on GNU/Hurd. Revert "tst_bic: make it possible to test for cross-compilation" fix typo in documentation Improve Bearer Management related documentation in QNetworkAccessManager Compile with QT_NO_ACTION. Unbreak compilation outside Mac QDBusAbstractInterface: don't set lastError outside the object's own thread tst_bic: make it possible to test for cross-compilation Remove Q_PACKED from QChar and QLocale::Data. QDebug operator for QFlags Removing unneeded qDebug statement. ...
| | * | Updating 4.7.0 change log.Bjørn Erik Nilsen2010-05-251-0/+4
| | | |
| | * | Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-05-241-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/styles/qmacstyle_mac.mm
| | * | | Remove Q_PACKED from QChar and QLocale::Data.Thiago Macieira2010-05-231-0/+7
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-211-8/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) qdoc: Fixed html error, but the problem is still there. qdoc: Changed number of columns to 1. Oila! Doc: Changes to the HTMLGenerator, style and js remove dead code that will never get called. add bytes and activeTime to corelwan. Fix formating of license header. fix irix build clarify wording of warning message close scope while inside assignment only if the last char is a closing brace deprecate undocumented -E option use qtPrepareTool for qdoc unify QMAKE_QMAKE path separator fixing simplify arcane conditional, once again qdoc: Propagate the language information into the XML as before. Removed a change from the 4.7.0 change log. Improve look and feel of itemviews on mac doc: Fixed many broken links. doc: Fixed many broken links. update 4.7.0 changes QPushButton's click area exceeds the button area by far on Mac OS X ...
| | | * | | Removed a change from the 4.7.0 change log.Kim Motoyoshi Kalland2010-05-201-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | The change belongs in the 4.6.3 change log.
| | | * | | update 4.7.0 changesKent Hansen2010-05-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mistakenly added something that was fixed for 4.6.3 (it's been moved to changes-4.6.3 in a different branch).
| * | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-251-2/+43
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| | | | | | | | | | | | | | | | | Conflicts: demos/spectrum/app/app.pro src/gui/egl/qegl.cpp tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro tests/auto/qmenu/tst_qmenu.cpp
| | * | | My 4.6.3 changes.Yoann Lopes2010-05-211-0/+21
| | | | |
| | * | | changes-4.6.3 updatedJoerg Bornemann2010-05-211-1/+21
| | | | |
| | * | | Typo.Trond Kjernåsen2010-05-211-1/+1
| | | | |
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-05-252-14/+127
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-211-1/+1
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: changes-4.7.0 updated Revert "Deselect the current selection when the QItemSelectionModel::model is reset." add missing include Fix crash when using fonts in non-gui QApplication Deselect the current selection when the QItemSelectionModel::model is reset. Autotest fix on macosx Compile with gcc 4.0.1 improve Unicode Normalization autotest more subtests for QChar nano optimization of canonicalOrderHelper() fix canonicalOrderHelper() for some corner case use new QChar::requiresSurrogates() instead of hardcoded value prevent fake normalization prefer QChar::*surrogate() over hardcoded values Fixed an assert in QMenu
| | * | | changes-4.7.0 updatedJoerg Bornemann2010-05-211-1/+1
| | | |/ | | |/|
| * | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-05-211-13/+126
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: My 4.6.3 changes. Added my 4.6.3 changes. My 4.6.3 changes. Add my 4.6.3 changes Fix WebKit version dependency in pkg files Add support for including module specific .pri files as part of qt.prf handling My changelog entries for 4.6.3 Add my changes to the 4.6.3 changes log my changelog for 4.6.3 Switch Symbian^3 QCursor implementation back to 5.0 way fix qmake -project once more
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-05-211-13/+126
| | |\ \ | | | |/
| | | * My 4.6.3 changes.Trond Kjernåsen2010-05-201-16/+73
| | | |
| | | * Added my 4.6.3 changes.Kim Motoyoshi Kalland2010-05-201-1/+4
| | | |
| | | * My 4.6.3 changes.Samuel Rødal2010-05-201-0/+12
| | | |
| | | * Add my 4.6.3 changesKent Hansen2010-05-201-2/+19
| | | |
| | | * My changelog entries for 4.6.3Denis Dzyubenko2010-05-201-2/+9
| | | | | | | | | | | | | | | | Reviewed-by: trustme
generated by cgit v0.12 at 2024-11-16 03:06:57 (GMT)