| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
Change-Id: I117e5dcd45397a9fbd1f033fc745ada00c221721
Reviewed-by: Donald Carr <donald.carr@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Simo Fält <simo.falt@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
| |
Task-number: QTQAINFRA-226
|
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Update 4.8.0 changelog
Changelog: update changes-4.8.0 for Richard
Add briefs for the new 4.8 examples.
Add briefs to the new 4.8 demos.
Add a brief to all demos and examples for manifest
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
QNetworkRequest autotest: adapt to new cookie parsing (re. commas)
Remove support for multiple cookies in one Set-Cookie header to follow RFC6265.
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
dist/changes-4.8.0
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This also allows cookie values to contain commas to increase compatibility like
most popular browsers do even though the RFC still reserves them for future uses.
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Task-number: QTBUG-21456
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Added text about -random and -seed options in QTest to changelog
Add another part of the source code to the snippet.
Update changes-4.8.0
Update translation sources.
Update the changelog for qdoc in 4.8
|
| | | | | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
MR #1272: Fix QSysInfo::WindowsVersion checking (QSysInfo::WV_NT_based is a mask)
MR #2616: QProgressBar: transparent background on Windows Vista (partId: PP_BAR -> PP_TRANSPARENTBAR)
MR #2526: Fix comctl32 v6 dependency generation in Visual Studio 2005 and higher
MR #2519: fix qFadeEffect windowOpacity issue on Windows
MR #769: qt_reg_winclass(): use RegisterClassEx() to load the small IDI_ICON1 icon correctly
Merge-request: 2708
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |_|_|_|/
|/| | | |
| | | | |
| | | | | |
Change recieved from Aurélien Gâteau
|
|\ \ \ \ \
| |_|/ / /
|/| | | | |
|
| |\ \ \ \
| | |/ / / |
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Update changes-4.8.0 file
Only limit cursor position when line is wrapped
Make sure cursor position doesn't exceed line end
Allow shared EGL contexts for xcb and xlib platforms
Allow generic EGL platform contexts to be shared
4.8 Changes: OpenGL Framebuffer Format
stop tslib plugin having same file name as linux input plugin
Avoid unnecessary detach of a QImage in QPixmapDropShadowFilter
|
| | | | | | |
|
| | | |\ \ \
| | | | | |/
| | | | |/|
| | | | | |
| | | | | | |
Conflicts:
dist/changes-4.8.0
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Added an entry for the OpenGL Framebuffer Format commit to the 4.8
changelog.
Merge-request: 1387
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| |/ / / /
|/| | | |
| | | | |
| | | | | |
Reviewed-By: Trust Me
|
| | | | | |
|
| |_|/ /
|/| | |
| | | |
| | | | |
Change recieved from James Perrett
|
| | | |
| | | |
| | | |
| | | | |
Change recieved from John Brooks
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
For QtConcurrent and QUuid.
|
|\ \ \ \
| | |/ /
| |/| |
| | | |
| | | | |
Conflicts:
dist/changes-4.8.0
|
| |\ \ \ |
|
| | |/ / |
|
| |/ / |
|
| | |
| | |
| | |
| | | |
Change recieved from David Faure.
|
| | |
| | |
| | |
| | | |
Change recieved from Steffen Hansen.
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
Change recieved from Cédric OCHS.
https://qt.gitorious.org/qt/qt/merge_requests/1157
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
Also contains changes from Miikka Heikkinen.
|
| | | |
|
| | | |
|
|/ /
| |
| |
| | |
Add the rest of my changes to the change log.
|
|\ \
| |/
|/|
| |
| | |
Conflicts:
doc/src/index.qdoc
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | | |
Change-Id: I3c7cecf1f099e2868653c041d88a4208b77c5748
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Added Solaris build fix to the changes file.
|
| | | |
|
|\ \ \ |
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | | |
Conflicts:
dist/changes-4.8.0
|