| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
examples/declarative/states/states.qml
examples/declarative/states/transitions.qml
examples/declarative/tutorials/helloworld/t3/tutorial3.qml
src/declarative/util/qmlanimation.cpp
|
| | |
|
| | |
|
| | |
|
|/
|
|
| |
Also removed all uses of SetProperty
|
|\
| |
| |
| |
| |
| |
| |
| | |
kinetic-declarativeui
Conflicts:
mkspecs/features/qt.prf
src/corelib/global/qglobal.h
|
| |\
| | |
| | |
| | |
| | | |
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.
|
|\ \ \
| |/ /
| | |
| | | |
kinetic-declarativeui
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | | |
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
kinetic-declarativeui
Conflicts:
configure.exe
tools/qdoc3/htmlgenerator.cpp
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | | |
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
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| |/ /
| | |
| | |
| | |
| | |
| | | |
QPropertyAnimation as a main class.
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | | |
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
|
| | | |
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
The example now uses QPlainTextEdit instead of QTextEdit
Reviewed-by: kavindra
|
| | | |
|
| | | |
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This should better communicate that new applications should
use QNetworkAccessManager.
Reviewed-by: David Boddie
|
| | | | |
|
| |\ \ \
| | |/ /
| |/| /
| | |/
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
demos/boxes/glshaders.cpp
src/gui/graphicsview/qgraphicsitem.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tools/linguist/shared/cpp.cpp
translations/linguist_ja.qm
translations/qt_ru.qm
|
| | |
| | |
| | |
| | |
| | | |
Task-number: 255888
Reviewed-by: kh
|
| | |
| | |
| | |
| | | |
Reviewed-By: TrustMe
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/qnamespace.qdoc
src/gui/painting/qdrawutil.cpp
|
| | | |
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
kinetic-declarativeui
Conflicts:
src/gui/graphicsview/qgraphicswidget.cpp
src/gui/painting/qdrawutil.cpp
src/gui/painting/qpainterpath.cpp
tools/qdoc3/test/qt-cpp-ignore.qdocconf
tools/qdoc3/test/qt-inc.qdocconf
|
| | |
| | |
| | |
| | |
| | |
| | | |
installation page.
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | |
| | | |
Task-number: 253715
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | | |
Reviewed By: andy
|
| | |
| | |
| | |
| | |
| | | |
Headers are slightly lighter now. Not all tables are
affected by the changes any more.
|
| | | |
|