| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Bring Qt 4.6 into the Qt-S60 repo.
Conflicts:
configure.exe
mkspecs/features/qttest_p4.prf
qmake/generators/makefile.cpp
src/corelib/io/qdir.cpp
src/corelib/io/qprocess.h
src/corelib/kernel/qcoreevent.h
src/corelib/kernel/qobject.cpp
src/corelib/kernel/qsharedmemory_unix.cpp
src/corelib/thread/qthread_p.h
src/corelib/tools/qvector.h
src/gui/dialogs/qdialog.cpp
src/gui/dialogs/qfiledialog.cpp
src/gui/dialogs/qfiledialog_p.h
src/gui/dialogs/qmessagebox.cpp
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsview.cpp
src/gui/image/qpixmapcache.cpp
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication_p.h
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_p.h
src/gui/painting/qdrawhelper.cpp
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontengine_qpf.cpp
src/gui/widgets/qmenubar.cpp
src/network/socket/qlocalserver.cpp
src/testlib/qtestcase.cpp
src/testlib/testlib.pro
tests/auto/qimagereader/tst_qimagereader.cpp
tests/auto/qitemdelegate/tst_qitemdelegate.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/qpixmap/qpixmap.pro
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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: 254455
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This makes the main window shown immediatly even when the webservice
of traffikanten.no cannot be reached. Does not properly fix the
associated task yet, e.g. display an error message.
Task-number: 254455
|
| | |
| | |
| | |
| | | |
Reviewed-By: TrustMe
|
| | |
| | |
| | |
| | | |
Reviewed-By: Ariya Hidayat <ariya.hidayat@nokia.com>
|
| |\ \ |
|
| | | | |
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This flag toggles whether we should send notifications for setPos,
setMatrix, and setTransform. It's off by default. Docs have been updated.
All autotests pass. This change also cleans up a bit so that we both
have readable code, and keeping the optimized path for when we need to
send the notifications.
By enabling this flag by default we are going to trigger regressions in
end-user code.
Reviewed-by: bnilsen
|
| | |
| | |
| | |
| | | |
Reviewed-by: Pierre
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
This enables the antialiazing to be done on the graph as a whole, and
not on every tiny line segment. The result is that the curve is painter
prettier.
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Draw the curve with anti-aliasing.
Do not use absolute black, but rather a dark black color for the lines.
Draw the red and blue dots, indicating the start and end points.
Reviewed-by: Jan-Arve
|
| | |
| | |
| | |
| | | |
Reviewed-by: TrustMe
|
| |\ \
| | |/ |
|
| | |
| | |
| | |
| | | |
The define no longer exists.
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QT-80
Reviewed-by: Ian Walters
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Thiago Marcos P. Santos (1):
Fixed sub-attaq example build
Request-url: http://qt.gitorious.org/qt/qt/merge_requests/564
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
|
| | | | |
|
| |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tests/auto/selftests/expected_skip.txt
tests/auto/selftests/tst_selftests.cpp
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
removed declaration of properties that are already declared in Qt
|
| | | | |
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
tests/auto/qtreeview/tst_qtreeview.cpp
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Alexis
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Alexis
|
| | | | |
| | | | |
| | | | |
| | | | | |
...hopefully
|
| |\ \ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
It isn't on all platforms.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
time() is not available on all platforms.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Kent Hansen
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This reverts commit 1cad8c56002a61a6240e6580cdbd784209821fa6.
Conflicts:
examples/graphicsview/padnavigator/roundrectitem.cpp
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
kinetic-animations
Conflicts:
src/corelib/kernel/kernel.pri
src/corelib/kernel/qvariant_p.h
src/corelib/tools/tools.pri
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicswidget.h
src/gui/gui.pro
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Trust Me
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Trust Me
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | | |
|
| | |\ \ \ \ \ |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
It's not done yet, so let's re-add it when it is.
|
| | | | | | | | |
|
| | |/ / / / / |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Stickman example
The connectByAnimation() function is no longer needed since we have default
animations. The docs are unfinished.
|
| | | | | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Three examples have been moved.
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
We decided to remove the const of the eventTest() since some transitions
have dynamic conditions and need to update when eventTest() is called.
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Also fixed: Added some docs and moved the tanks a little so they don't start
partly outside the scene rect.
|