| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: (81 commits)
Added addMMPRules for adding conditional MMP_RULES
Allow overriding TARGET.EPOCHEAPSIZE with MMP_RULES
Build break fix for commit d8465414e6fd543cfc20e732030dedd8d2bc685f.
Fix for cetest.
Speed up compilation of this test with MSVC.
New benchmark for QDirIterator
Backporting auto-test utility header from master.
Fix a signed/unsigned comparison compiler warning
Removed an export that shouldn't be exported.
Reduced the code and memory footprint of the keymap.
Enabled Qt key events to work also when native key code is missing.
Cleaning of the patch to QTBUG-3168
Patch to QTBUG-3168
Crash in QGraphicsScenePrivate::setFocusItemHelper
Pass the right arguments to QApplication in GraphicsView benchmark.
Improvements to itemview keypad navigation in S60.
Revert changes made in scroll_sys().
Fix SymbianMakefileGenerator::absolutizePath for clean builds
Set the roleNames of proxy models to the roleNames of the source model.
Add benchmarks for accessing meta-object properties via QScriptValue
...
|
| |\
| | |
| | |
| | |
| | |
| | | |
Conflicts:
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake_abld.h
|
| | |
| | |
| | |
| | |
| | | |
The `check' target is now automatically recursive on all subdirs
projects.
|
| | |
| | |
| | |
| | |
| | |
| | | |
when running `qmake -r -tp vc', if any project is encountered which is
disabled with requires(), the generated .sln file ends up missing many
unrelated projects.
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | | |
Conflicts:
tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp
tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp
|
| |\ \ |
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/network/access/qnetworkaccessmanager.cpp
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
configure
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
src/s60installs/s60installs.pro
|
| |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
configure
src/gui/painting/qpainter.cpp
src/s60installs/s60installs.pro
|
| | | | | | | | |
|
| |_|_|_|_|/ /
|/| | | | | |
| | | | | | |
| | | | | | | |
QDeclarativeXXX.
|
|\ \ \ \ \ \ \
| |_|_|_|_|/ /
|/| | | | | /
| | |_|_|_|/
| |/| | | | |
|
| | | | | | |
|
|\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
configure.exe
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qgl.cpp
|
| |\ \ \ \ \ \ |
|
| | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (126 commits)
Skip OpenGL threading tests on Mac as they were causing reboots
Fixed compile of autotests.
Fix warnings on gcc
Add experimental VBO support for drawCachedGlyphs()'s index array
Fix threaded gl autotest build failure on GLES2
Removed redundant debug output from trace benchmark.
Added two QML based traces to trace benchmark.
Fixed old trace files no longer working.
Reduced the memory footprint of qttrace files.
Added trace replayer benchmark.
Added --range and --single arguments to qttracereplay.
Always accept values reported directly using QTest::setBenchmarkResult.
Make threading use-cases work for X11
Run firstRun initialization in declarative/painting benchmark
Optimization for text drawing on OpenGL
Enable QStaticText in QtDeclarative painting benchmark
Fix no-webkit compiler helpviewer
Make sure height of glyph cache is a power of two
Fixes crash when destroying a QGraphicsItem.
Move benchmarks/qvector to benchmarks/corelib/tools/qvector
...
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Rename tst_openglthreading.pro to qgl_threads.pro:
.pro file name must match directory name for SUBDIRS project to work.
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | |\ \ \ \ \ \ \
| | | | |_|_|_|_|/
| | | |/| | | | | |
|
| | |\ \ \ \ \ \ \ |
|
| | | | | | | | | | |
|
| | |\ \ \ \ \ \ \ \
| | | | |_|_|_|_|/ /
| | | |/| | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Conflicts:
tests/auto/tests.xml
|
| | | | | | | | | | |
|
| | |_|_|_|/ / / /
| |/| | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
When the paint engine does not support QStaticText, we fall back to
regular drawText() calls. This fallback would previously paint all
text to (0, 0). This fixes the qstatictext autotest on Linux.
Reviewed-by: Olivier
|
| | |_|_|/ / / /
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
- Make bindTexture threadsafe
- Document which areas of QGLWidget needs locking in order
to do out-of-gui thread rendering
- Testcases to prove that these cases work
Reviewed-by: Trond
|
|\ \ \ \ \ \ \ \
| |/ / / / / / /
|/| | | | / / /
| | |_|_|/ / /
| |/| | | | | |
Conflicts:
src/corelib/codecs/qtextcodec.h
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
These tests were adding the same SUBDIR multiple times from different
projects. Don't do that.
|
| | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
SUBDIRS+=../path/to/lackey from two different places means that qmake
sees the lackey project twice. This breaks the vcproj generator.
Make it so that lackey is only referred to once.
|
|\ \ \ \ \ \
| |/ / / / /
| | | | / /
| |_|_|/ /
|/| | | |
| | | | | |
Conflicts:
src/gui/kernel/qcocoapanel_mac.mm
src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
|
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Use "make check" to run all the auto-tests.
Task-number: QTPROD-442
Reviewed-by: Harald Fernengel
Reviewed-by: Rohan McGovern
|
|/ / /
| | |
| | |
| | | |
Reviewed-by: Sarah Smith
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
These auto tests are working only if developer build is defined, so exclude
those otherwise.
Reviewed-by: Rohan McGovern
|
|/ /
| |
| |
| |
| |
| | |
This selftest enforces that tests/auto/auto.pro is properly maintained.
It may be extended to check other elements of the environment necessary
for autotests to run correctly.
|
|\ \
| | |
| | |
| | | |
into 4.6
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Also add an extensive autotest suite for QProcessEnvironment
Task-number: QTBUG-6701
Reviewed-by: Markus Goetz
|
|/ / |
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
tests\auto\auto.pro does not check for qt3support or opengl.
On symbian this generates errors as the build file generation
for the tests is skipped but the tests are still added into
bld.inf for the autotests.
X:\QT\tests\auto\BLD.INF:250: qgl\bld.inf: No such file or directory
Added check for qt3support before adding Q3SUBDIRS
and opengl check before adding qgl.
External-Reviewed-by: samuelnevala
Merge-request: 2104
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
|
|
|
| |
Reviewed-by: Olivier Goffart
|
|\ |
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
|/
|
|
|
|
|
|
| |
X11/Windows: Launch gui application and stop them
via Windows manager, check stderr, exit codes, etc.
Currently tests Qt Designer, Qt Linguist, Qt Demo and
prominent examples/demos.
Rubber-stamped-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
| |
Does nothing if no declarative directories installed.
|
|
|
|
| |
Reviewed-by: alexis
|
|\ |
|
| |
| |
| |
| |
| |
| |
| | |
Implemented gestures using gesture events and separate
QGesture/QGestureRecognizer classes.
Reviewed-by: trustme
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
| |
When there are only pause animations running, the timer will stop and
restart when the closest pause animation finishes. While there are only
pause animations running, there are no additional timer ticks, but
if there is at least one animation running that is not a group or a pause,
then the global animation timer will restore it's update interval.
Includes a new auto-test for the QPauseAnimation class.
Task-number: QT-941
Reviewed-by: thierry
Reviewed-by: janarve
|
|
|
|
| |
Reviewed-by: Trond
|
|
|
|
| |
One item slipped and was now added.
|