| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
| |
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
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Eskil
|
| | | | |
|
| |/ /
|/| | |
|
| | | |
|
| | | |
|
|/ / |
|
| | |
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 1259
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
|/ / |
|
| |
| |
| |
| |
| |
| |
| | |
Change-Id: I8913c88e5bd68145e0587d51ee9896fd5d21054a
Reviewed-on: http://codereview.qt.nokia.com/140
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
(cherry picked from commit bc7ea289ea84dcff22aeea78c01a5447ccf076f7)
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/opengl/qwindowsurface_gl.cpp
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | |
| | |
| | |
| | |
| | |
| | | |
Placeholder file created to allow package creation
Reviewed-by: TrustMe
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
|
| |/
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qcocoaview_mac.mm
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
src/testlib/qtestcase.cpp
|