| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Task-number: QTBUG-21210
|
|
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|\
| |
| |
| |
| |
| |
| | |
merge-requests/1108
Conflicts:
doc/src/declarative/basictypes.qdoc
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-16084
Reviewed-by: Jason McDonald
|
|/
|
|
|
| |
This helps them to be marked up correctly in cases where code
markers are available.
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
| |
The macro doesn't always create a QApplication, it depends on whether
QT_GUI_LIB is defined.
Task-number: QTBUG-3899
Reviewed-by: Rohan McGovern
|
|
|
|
| |
Silence shadowing warnings from gcc.
|
|
|
|
| |
Reviewed-by: trustme
|
|
|
|
|
|
| |
In the repository, we should always use the No Commercial license
alongside the GNU Free Documentation License for documentation
files.
|
|
|
|
|
| |
Tasks: QTBUG-13271, QTBUG-13212, QTBUG-12321
Reviewer: David Boddie
|
|
|
|
|
|
|
| |
It's faster to calculate the time with it, since it doesn't need to
convert to local time first.
Reviewed-By: Harald Fernengel
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qt_s60_p.h
src/opengl/qglextensions.cpp
src/opengl/qglshaderprogram.cpp
tests/auto/mediaobject/tst_mediaobject.cpp
|
| |
| |
| |
| |
| |
| |
| | |
Symbian, both hardware and emulator.
Task-number: QTBUG-12622
Reviewed-by: Shane Kearns
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
tests/auto/qimagereader/tst_qimagereader.cpp
tools/qtestlib/chart/database.cpp
tools/qtestlib/chart/database.h
tools/qtestlib/chart/reportgenerator.cpp
tools/qtestlib/chart/reportgenerator.h
|
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit 453abe70fec02456aba2219025f5202060eaece1.
Task-number: QT-3583
Reviewed-by: Jason McDonald
|
| |
| |
| |
| |
| | |
Reviewed-by: Trust Me
Requested-by: Legal
|
| |
| |
| |
| | |
Reviewed-by: Morten Sørvig
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
20 ms is a bit too to get a precise measurement due to limited timer
resolution. We increase the limit to 50 ms and introduce a warm-up iteration
to prevent any state or cache-related issues which can be hard to account
for in the tests.
On the N900 this seems to decrease the variance of test results by 30 %,
and fixes some cases where the results were way off due to hidden state.
Task-number: QT-3390
Reviewed-by: Morten Sørvig
|
|\ \
| |/
| |
| |
| | |
Conflicts:
translations/translations.pri
|
| |
| |
| |
| | |
Reviewed-by: Jason Barron
|
| |
| |
| |
| | |
benchmarkMetricUnit (human text)
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
src/openvg/qpaintengine_vg.cpp
src/script/bridge/qscriptqobject_p.h
tests/auto/bic/tst_bic.cpp
|
| |
| |
| |
| | |
Task-number: QTBUG-6320
|
| |
| |
| |
| | |
Task-number: QTBUG-6278
|
| |
| |
| |
| |
| | |
XML test logger message type changed from "qwarn" to "qwarning" for
warnings, apparently accidentally.
|
| | |
|
| | |
|
| |
| |
| |
| |
| | |
To avoid using QTimestamp to test QTimestamp, use QTest::qSleep in
QTimestamp's own testcase.
|
| | |
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/gui/styles/qs60style_s60.cpp
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| |
| |
| | |
Also adapt QTestLib not to call invokeMethod on unexisting method to
avoid warnings
Task-number: QTBUG-7331
Reviewed-by: Brad
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/declarative/advtutorial1.qdoc
doc/src/declarative/advtutorial2.qdoc
doc/src/declarative/advtutorial3.qdoc
doc/src/declarative/advtutorial4.qdoc
doc/src/declarative/tutorial1.qdoc
doc/src/declarative/tutorial2.qdoc
doc/src/declarative/tutorial3.qdoc
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
configure.exe
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qgl.cpp
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/corelib/codecs/qtextcodec.h
tests/auto/gestures/tst_gestures.cpp
|
| |\ \ \ \
| | | |_|/
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tools/assistant/tools/assistant/helpviewer.cpp
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (26 commits)
QLocalSocket::isValid on Windows must check for broken connection
fix pipe handle leak in qlocalsocket_win.cpp
GraphicsViewBenchmark: Run app in full screen mode on small desktops.
Fix Thai text on Windows 7
Fix License headers.
QTextCodec::codecForName. Insert in the cache in all cases.
Prevented calling the pixmap filter implementations with null pixmaps.
Make it possible to run benchmarks with the "-graphicssystem" switch.
Add support for running the GraphicsViewBenchmark application manually.
Bump version to 4.6.3.
Fixed a GLX warning that occured with some Intel chipsets under X11.
Fixed compile for maemo6.
Cleanup QEglContext & EGLDisplays
Moved 'hasAlpha' property from GL2 engine to GL paint device.
Remove useless qDebug in QTextCodec autotest
QTextCodec: Symbian has codec for UCS2, only fallback to UTF16 if UCS2 codec cannot be loaded
Add caching to QTextCodec::codecForName and QTextCodec::codecForMib
Add benchmark for QTextCodec
Fix several bugs with GL texture cache
Compile fix for OpenGL ES.
...
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Problem was that the "-graphicssystem" switch were not recognized as a valid
benchmark option so the test failed to execute with the following
warning: "Unknown option: "-graphicssystem"". We have to pass it through
to QApplication, in the same fashion as we do for "-qws".
Reviewed-by: jasplin
|
| | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When specific test functions and data tags are requested from the
command line, a non-existing data tag will produce error output *iif*
data tags are available for the function. However, if no data tags are
available, element 0 in testData would be dereferenced, resulting in a
crash.
Special case the empty data tag, even if no tags are available, because
some loggers (e.g., the QXmlTestLogger) will output results with no tag
the same way as those with an empty data tag.
Reviewed-by: Morten Sørvig
|
|\ \ \ \ \
| | |_|_|/
| |/| | |
| | | | |
| | | | | |
Conflicts:
doc/src/declarative/advtutorial1.qdoc
|
| |\ \ \ \
| | | |_|/
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
tools/assistant/tools/assistant/helpviewer_qtb.h
tools/assistant/tools/assistant/helpviewer_qwv.cpp
tools/assistant/tools/assistant/helpviewer_qwv.h
|
| | |/ /
| |/| |
| | | |
| | | | |
Reviewed-by: jasplin
|
| |/ /
|/| |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-7805
Patch-by: Pino Toscano
Reviewed-by: Trust Me
|
|/ /
| |
| |
| | |
Reviewed-by: Trust Me
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
Since BenchLib now uses floating point for its calculations, we should
format both the value per-iteration and the total the same
way. Otherwise, it would output something like "2e+08" for the total.
Reviewed-by: Morten Sørvig
|
| |
| |
| |
| |
| |
| |
| | |
The crash handler is removed when the FatalSignalHandler object goes
out of scope, which it did right inside that if.
Reviewed-By: Harald Fernengel
|