| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.gitignore
configure.exe
src/corelib/concurrent/qtconcurrentthreadengine.h
src/corelib/global/qnamespace.h
src/gui/graphicsview/qgraphicssceneevent.h
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication.h
src/gui/kernel/qapplication_p.h
src/gui/kernel/qapplication_qws.cpp
src/gui/kernel/qwidget.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontdatabase.cpp
src/network/access/qnetworkaccesshttpbackend.cpp
tests/auto/network-settings.h
tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro
tests/auto/qvariant/tst_qvariant.cpp
|
| | |
| |
| |
| |
| |
| | |
Reviewed-By: Joerg Bornemann <joerg.bornemann@trolltech.com>
Task: 157404
|
| | |
| |
| |
| | |
Reviewed-by: Andreas Aardal Hanssen
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
screenshots and some cleaned up sentences.
Reviewed-By: TrustMe
Details: Also fixed the error in the sentence mentioning that
QButtonGroup can be used to group buttons visually thanks to a
bug report.
|
| | |
| |
| |
| | |
Reviewed-by: Trust Me
|
| | |\ |
|
| | | |
| | |
| | |
| | | |
Reviewed-by: trustme
|
| | | |
| | |
| | |
| | | |
Reviewed-by: trustme
|
| | |\ \
| | |/ |
|
| | | |\ |
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| | |\ \ \
| | | |/
| | |/|
| | | |
| | | | |
Conflicts:
src/gui/kernel/qapplication_x11.cpp
|
| | | | |
| | | |
| | | |
| | | | |
We no longer support it, so make that obvious in the docs as well.
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/sql/drivers/psql/qsql_psql.cpp
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The custom dash pattern must have an even number of entries. Our
examples were using an odd number.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
examples
Reviewed-By: TrustMe
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-By: TrustMe
|
| | |\ \ \ \
| | |/ / / |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This change also moves the EGL support classes from QtOpenGL to QtGui
so they can be shared between OpenGL and OpenVG.
|
| | | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
should make it easier to apply a network disk cache with code snippets
now
Reviewed-by: David Boddie <dboddie@trolltech.com>
Reviewed-by: Martin Petersson <martin.petersson@trolltech.com>
|
| | |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/qnamespace.qdoc
src/corelib/global/qnamespace.h
src/gui/graphicsview/qgraphicsscene.cpp
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
enum Qt::Uninitialized contains one value, which is also called
Uninitialized. Because the type and the value used the same name,
wherever the type Qt::Uninitialized was used in a function signature,
you had to include the enum keyword. But qdoc's preprocessor doesn't
like that, so you have to take the enum keyword out of the signatures.
But then the compiler complains because the type and the value look
the same. So I had to change the enum type name to Initialization, so
the compiler can distinguish it from the value name. And qdoc likes
that too.
|
| | | |\ \
| | | |/
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
configure.exe
tests/auto/qpainter/tst_qpainter.cpp
translations/qt_ru.ts
|
| | | | |
| | | |
| | | |
| | | | |
Acked-by: Andy Shaw
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
These constructors are useful when you have to create a temporary
uninitialized QTransform/QMatrix and later initialize it to something
else.
Done with Lars.
Reviewed-by: samuel
|
| | | |\ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Trust Me
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QPropertyAnimation as a main class.
Reviewed-by: Trust Me
|
| | |\ \ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | | |
Conflicts:
src/gui/graphicsview/qgraphicsitem_p.h
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The QStringBuilder class documentation is marked \internal.
A section has been added to the documentation for QString
that explains how to use the reimplemented '%' operator of
QStringBuilder to obtain more efficient string concatenation
operations.
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| | |\ \ \
| | |/ /
| | | |
| | | |
| | | | |
Conflicts:
src/gui/graphicsview/qgraphicsscene_p.h
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Bruno Abinader <bruno.abinader@openbossa.org>
Merge-request: 628
Reviewed-by: David Boddie <dboddie@trolltech.com>
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QAbstractClass is in fact QAbstractTransition, also added proper link
to the addAnimation() method from that class.
Signed-off-by: Bruno Abinader <bruno.abinader@openbossa.org>
Merge-request: 628
Reviewed-by: David Boddie <dboddie@trolltech.com>
|
| | | |\ \
| | | |/ |
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| | |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/qnamespace.qdoc
doc/src/snippets/code/src_gui_qproxystyle.cpp
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication_x11.cpp
src/gui/kernel/qt_x11_p.h
src/gui/kernel/qwidget.cpp
src/gui/styles/qproxystyle.cpp
src/gui/styles/qstyle.cpp
src/scripttools/debugging/qscriptdebugger.cpp
src/scripttools/debugging/qscriptenginedebugger.cpp
src/sql/drivers/odbc/qsql_odbc.cpp
src/sql/kernel/qsqldatabase.cpp
src/sql/kernel/qsqldriver.cpp
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The example now uses QPlainTextEdit instead of QTextEdit
Reviewed-by: kavindra
|
| | | | | |
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/gui/graphicsview/qgraphicsitem_p.h
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
this is an internal widget state variable, so the name should reflect
that (and we shouldn't include it in the docs either)
|
| | |\ \ \ \ |
|
| | |\ \ \ \ \ |
|
| | |\ \ \ \ \ \ |
|
| | |\ \ \ \ \ \ \ |
|
