| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| | |
Conflicts:
src/corelib/thread/qthread_unix.cpp
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Fixed compilation of qpixmap_raster.cpp
Draw graphics item bounding rects drawn when QT_DRAW_SCENE_ITEM_RECTS=1
Put all the declarations of qt_defaultDpi{,X,Y}() in one place
Really avoid compiler warnings on Windows
Made extension resolving work with Core profile.
Avoid some compiler warnings on Windows
Fix positioning in GL2 paint engine with subpixel antialiasing
Update defs files
Doc: Updating 3rdparty license doc
Update .def files
Another compilation fix for WinCE
Updating libjpeg: Add Qt building modifications
Updating libjpeg: Add version 8c.
Updating libjpeg: Removing libjpeg version 8
|
| | |
| | |
| | |
| | | |
Corresponding to the updated zlib, libpng, and libjpeg in src/3rdparty.
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Add branch prediction macros
Add methods for traversing and combining QProcessEnvironment.
Handle the HTTP 418 reply properly in QNAM
absorb translations.pri into translations.pro
let generated flag control SQL generation
Add version attributes as per ODF specification
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This adds support for Q_LIKELY and Q_UNLIKELY macros which instruct the
compiler on which branch of an "if" statement is more likely to happen.
The current patch only supports GCC's __builtin_expect().
Merge-request: 2580
Reviewed-by: ossi
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/declarative/dynamicobjects.qdoc
doc/src/declarative/elements.qdoc
doc/src/examples/qml-examples.qdoc
|
| | |\ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-14445
Reviewed-by: Jerome Pasion
|
| | | |\ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-14580
|
| | |\ \ \ \
| | | | |/ /
| | | |/| | |
|
| | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Can't use Q_OBJECT without inheriting from QObject.
Reviewed-by: David Boddie
|
| | |\ \ \
| | | |/ / |
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-17879
Reviewed-by: David Boddie
|
| | |/ / |
|
| | |\ \ |
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: David Boddie
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: David Boddie
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: David Boddie
|
| | | | | |
|
| | | | | |
|
| | |/ / |
|
| | | | |
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
merge-requests/1113
Conflicts:
doc/src/development/qmake-manual.qdoc
|
| | | | | |
|
| | |\ \ \ |
|
| | | |\ \ \ |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-17556
|
| | | |/ / /
| | |/| | |
| | | | | |
| | | | | |
| | | | | | |
Squashed commit containing changes to documentation during the
development of a threading tutorial, written by Roland Wolf.
|
| | |\ \ \ \
| | | |/ / / |
|
| | | |\ \ \ |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-14959
Reviewed-by: Kent Hansen
|
| | | | | | | |
|
| | |\ \ \ \ \
| | | |_|/ / /
| | |/| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
merge-requests/1108
Conflicts:
doc/src/declarative/basictypes.qdoc
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | | |
|
| | |\ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
doc/src/declarative/qdeclarativemodels.qdoc
doc/src/index.qdoc
doc/src/template/style/style.css
tools/qdoc3/atom.h
tools/qdoc3/doc.cpp
tools/qdoc3/doc/qdoc-manual.qdoc
tools/qdoc3/doc/qdoc-manual.qdocconf
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Added \span and \div marked "new" and marked
\raw "avoid".
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
e.g. \span {id="color-red"} {Color this text only}, not this text.
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
8 instances of raw-html remain.
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
11 instances of raw-html remain.
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
And removed some \raw cases. Only 11 raw-html uses remaining.
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
And removed some \raw cases. Only 13 raw-html uses remaining.
Added the figCaption clause to style.css.
|
| | | | | | | | |
|