summaryrefslogtreecommitdiffstats
path: root/dist
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
* | | Fix a color propagation issue with Combobox line editJens Bache-Wiig2010-09-281-0/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Some pixmap based themes were affected by this issue since they needed to resolve the palette against the widget and the lineedit palette was already resolved. We now set the palette on the lineedit when you modify the parent palette. You can still maintain a separate palette on the lineedit, but you have to set it after the parent has been set. We can remove some workarounds for plastique and vista style due to this. Task-number: QTBUG-5950 Reviewed-by: ogoffart
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-211-0/+4
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp
| * Updated 4.7.0 changelogmread2010-09-101-0/+4
| | | | | | | | | | | | Updated 4.7.0 changelog with Avkon removal compatibility information Reviewed-by: Harald Fernengel
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-101-5/+19
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf
| * Add some more changes for 4.7.0Jens Bache-Wiig2010-09-011-5/+19
| |
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-303-2/+136
|\ \ | |/ | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-271-0/+12
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (374 commits) Add a test for the QPen::brush() != Qt::NoBrush for a Qt::NoPen pen. Calling QPen::brush() on a Qt::NoPen pen, should return QBrush::NoBrush. use QFile:map instead of ::mmap Do not use global static const references to objects Revert "Refactor blend_transformed_bilinear to simplify the blend type checking" Don't rely on mapFromGlobal in QGraphicsScenePrivate::itemsAtPosition. Refactor blend_transformed_bilinear to simplify the blend type checking Note RTL behavior changes in docs and changelog Implement qt_memfill32 with Neon. Implement the composition mode Plus with Neon. Fix the broken unicode detection of ODBC driver. Doc: Fixed qdoc warnings. Doc: updating getting started docs - not finished Make it possible again to build Qt without webkit Doc: fixing creator bugs, removing menus and textbox in the header Fixing qdoc index file...Commit hack to work around the massive amounts of dependencies in the upstream branch. Doc: Fixing overlapping text in header list Use Ctrl rather than Alt for switching tabs in the demo browser Doc: add link to new gettings started to index.html Doc: Fixing bug involving header misplacement in Creator style ...
| | * Note RTL behavior changes in docs and changelogJiang Jiang2010-08-251-0/+12
| | | | | | | | | | | | | | | Task-number: QT-3292 Reviewed-by: Lars Knoll
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-261-0/+118
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (61 commits) Autotest: don't use Q_FUNC_INFO for testing which method got called fix generated makefile dependencies Cocoa: Demo browser can get stuck after closing modal dialog Restore default if to system default on session close. tst_qmake doesn't need QtGui Use the full path to qmake in the qmake unit test qdoc: Fixed erroneous links to QML basic types. Fixed item view background color in Gtk style scope fixes and clutter reduction for sql driver projects I don't know why some linkers can't call this function, so comment it out. QNetworkSession::close() method now send closed() signal while faking disconnection. Add the missing license headers to the QString benchmark data Fix building of qsimd.cpp on Windows CE Use QElapsedTimer for the benchlib tests. Properly implement the CPU feature disabling in qsimd.cpp. Report the detected CPU features in the corelib boilerplate Detect CPU features on ARM by reading the ELF auxvec. Split the CPU-detection code into multiple functions for readability Fixed delivering gestures to a toplevel widget. Unroll the SSSE3 code even more to avoid the need to keep an extra variable for inverting the result ...
| | * | Use QElapsedTimer for the benchlib tests.Thiago Macieira2010-08-241-0/+118
| | |/ | | | | | | | | | | | | | | | | | | It's faster to calculate the time with it, since it doesn't need to convert to local time first. Reviewed-By: Harald Fernengel
| * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-08-261-2/+6
| |\ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: bin/syncqt src/opengl/qgl.cpp tools/configure/configureapp.cpp
| | * Fix OpenGLVersionFlags on OpenGL 4.0 systemsRhys Weatherley2010-08-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the OpenGL version was 4.0 or higher, the flags for 1.1, 1.5, 2.0, and so on were not being set. This lead to the flags indicating that older OpenGL versions were not supported when they clearly were. Back port parts of 28659c21d12a267b10e5b441bf4c776e04d69bdc from Qt 4.7 to fix this in Qt 4.6. Task-number: QTBUG-12554 Reviewed-by: Sarah Smith
| | * Update changes-4.6.4 with recent shader program changesRhys Weatherley2010-08-131-0/+2
| | |
| | * Don't define highp/mediump/lowp if desktop GL has themRhys Weatherley2010-08-131-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenGL 4.0 systems now have compatibility with ES2, including support for the precision qualifiers. If the GL_ARB_ES2_compatibility extension is present, then we don't define highp/mediump/lowp to the empty string. Task-number: QTBUG-12862 Reviewed-by: Sarah Smith
* | | 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
generated by cgit v0.12 at 2024-11-27 14:06:46 (GMT)