| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
Some of them do not compile:
tst_bench_qresourcesmanager.cpp(115) : error C2039: 'time' : is not a
member of 'std'
For now let's just skip them in wince builds.
Change-Id: Id58ef24431abeb2916836e7ab5a9a05f8c8eeb01
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
| |
As for preparation for Qt5.5 release the copyright header is
updated to correspond the current license requirements.
Change-Id: I36632918b66f455539453b42c369689fb11298ec
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: I298fbaf819a118a5da4453082ec7f1484835480a
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
| |
Once we are happy with the API we can make this public for a future
release.
Change-Id: I914f087e10adddbadac1649a8b889b9f53f82fd2
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Results for instr:k perf counter on my machine are:
********* Start testing of tst_QFrameAllocator *********
Config: Using QtTest library 5.5.0, Qt 5.5.0 (x86_64-little_endian-lp64 shared (dynamic) release build; by GCC
4.9.2)
PASS : tst_QFrameAllocator::initTestCase()
PASS : tst_QFrameAllocator::benchmarkAllocateSmall()
RESULT : tst_QFrameAllocator::benchmarkAllocateSmall():
1,060,442 instructions per iteration (total: 1,060,442, iterations: 1)
PASS : tst_QFrameAllocator::benchmarkAllocateBig()
RESULT : tst_QFrameAllocator::benchmarkAllocateBig():
1,145,940 instructions per iteration (total: 1,145,940, iterations: 1)
PASS : tst_QFrameAllocator::benchmarkDeallocateSmall()
RESULT : tst_QFrameAllocator::benchmarkDeallocateSmall():
901,579 instructions per iteration (total: 901,579, iterations: 1)
PASS : tst_QFrameAllocator::benchmarkDeallocateBig()
RESULT : tst_QFrameAllocator::benchmarkDeallocateBig():
901,579 instructions per iteration (total: 901,579, iterations: 1)
PASS : tst_QFrameAllocator::benchmarkAllocateRaw()
RESULT : tst_QFrameAllocator::benchmarkAllocateRaw():
1,067,539 instructions per iteration (total: 1,067,539, iterations: 1)
PASS : tst_QFrameAllocator::benchmarkDeallocateRaw()
RESULT : tst_QFrameAllocator::benchmarkDeallocateRaw():
971,701 instructions per iteration (total: 971,701, iterations: 1)
PASS : tst_QFrameAllocator::cleanupTestCase()
Totals: 8 passed, 0 failed, 0 skipped, 0 blacklisted
********* Finished testing of tst_QFrameAllocator *********
Change-Id: Iae2bcd53d4efcff4b8486b4571dc1d1acfcbc19d
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The tricks applied are identical to those done previously for
ArrayAllocationPolicy:
We remove the obsolete hash for the index mapping and instead use
pointer differences directly, which is much faster and reduces
the memory consumption.
Some variables are also renamed to better reflect common allocator
nomenclature.
The added benchmark shows a reduction of the instruction count
by a factor of about 10.
Change-Id: Icabc354ab9e1e8ea0b1dc83c71a2f2cfe49d1da0
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Startup memory usage is now 10% of what it was before.
Unit tests corrected and benchmarks added.
Benchmarks:
DynamicArrayPolicy
QResourcesManager
Change-Id: Idaeedba5156ac2d6a0a494e7399d9dcb141dc81c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is different to QtCore's QRingBuffer. QRingBuffer deals with
raw bytes with a non-contiguous list of QByteArrays. QCircularBuffer
is strongly typed and the data is guaranteed to be stored in a
contiguous block of memory. Although the start/end of the buffer
may not correspond to the start/end of the block of memory once it
has reached capacity and wraps around.
Done-with: Andreas Hartmetz and Marc Mutz
Change-Id: Id03ad308b13fb359604d19474d892ff22c1e9b93
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
|
|
|
|
|
|
|
| |
With: Paul Lemire
Change-Id: I47a228553da06d9692a206fd2424beea0a163b2f
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
| |
If needed we can fetch stuff back from master branch.
Change-Id: Ic35f989de4a59d2c0a18ca6b18f0c0aca64d5046
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
| |
Change-Id: Ic6c05d78f617155892b546721946ee2c5c9b660a
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
|
|
|
|
|
|
|
| |
Change-Id: I53de6de78a982968c31a9c8d17628d1cddb63a14
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
| |
qt is already added by spec_pre.prf, warn_on by default_pre.prf.
Change-Id: I362942adad909b718c0af7c7e44cd0c8688901c2
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
| |
there is no point to use this for in-module references.
cleaning it out in an attempt to purge the constants entirely.
Change-Id: I4577b09b8eadac9cb10974f0a8cfc88d24bbd7db
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: Ib09067b91869c2840710bffee104bc63c76b0bf7
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
This commit changes the API of all classes in this module to use float
rather than qreal. This makes the API consistent across platforms and
improves floating point performance.
Change-Id: I95ae65cb31428748e066d5efca059ce24087fafa
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Sarah Jane Smith <sez@storybridge.org>
|
|
|
|
|
|
|
|
|
|
| |
Qt 5.0 beta requires changing the default to the 5.0 API, disabling
the deprecated code. However, tests should test (and often do) the
compatibility API too, so turn it back on.
Task-number: QTBUG-25053
Change-Id: Ic47384e3ed17e5f7b7402757eb995bfa898656a8
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
|
|
|
|
| |
The C++ implementation of Qt3D could not be compiled without also having
installed QtQML and QtQuick. This change allows the compilation of the
non-QML part of Qt3D separately.
Change-Id: I791a03a0f0e1118f3ec20b77be327786148b8923
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
For the Qt5 release Qt3D will be bumped to 2.0 to match QML2.0 and thus
we need to apply this across all code and examples.
Task-Number: QTBUG-26183
Change-Id: Ief54cb6f39da97ccfeeccc56f93a77b25316f71e
Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
|
|
|
|
|
|
|
| |
-stl/-no-stl is not supported in Qt 5
Change-Id: Ia2eccaac0e880700996a20a8992ac14eee9b9da4
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
|
|
| |
Somehow these files had escaped the naming done previously and still had
the old QtQuick3D.
Change-Id: Ia84be39b4bd13977b96d14ac7ae17c140f6a5a47
Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
|
|
|
|
|
|
|
|
|
| |
QML renaming must be done before the deprecation mechanism is turned
off.
Task-number: QTBUG-24722
Change-Id: I8e4b9c919eefa72184fa1745d10141885f83369c
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This doc change by 'integrating into Qt5' also made some changes to the
build system, so that now you need QT+=3d everywhere (instead of
QT+=qt3d as it was previously).
We have been asked to make this change, and it seems it is required for
this doc system to work, so lets get it done.
Note that the original change had a docsnippets target but that did not
work at all and will have be done in a later commit.
Change-Id: Icf4bc6b4be9494f1752e18ca1f5198c8fe8ecf53
Reviewed-by: Peter Yard <peter.yard@nokia.com>
Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>
|
|
|
|
|
|
|
|
| |
Changed all instances of "import QtQuick 1.0" to 2.0, and removed all
instances of "import Qt 4.7"
Change-Id: I2a8a3022e4596e9d9957f242c98c2e483467e206
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Iaddf1e489f97d2b08894827c90e9e58cd02d2ef2
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
| |
Replace Nokia contact email address with Qt Project website.
Change-Id: I36e7a01dc458ad25afef2de46a5807f2983fac43
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
| |
Change-Id: I6e681df7e4fac972a604531cecd9850cd9710935
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Pull out all references to QGLContext, and QGLWidget and so on; and
replace with the equivalent from the gui library. Where there is no
equivalent, eg the BindOptions enum, then reimplement.
Also get rid of the harmattan and symbian packaging goop. This had
become completely unmaintainable, and was making it very hard to see
what dependencies were being pull in by the various parts of the build
system. In order to have any confidence that conditional compilation
would not add in some problematic dependency, clean all this up.
Task-number: QTBUG-23299
Change-Id: Ied92ca1397076986e455674b064d8540bb13c0df
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
|
|
|
|
|
| |
Change-Id: I1f980fecc22780584b54704ec03c4d37439799ca
Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
|
|
|
|
|
| |
Change-Id: Icd7709d4fd91fc972d503f8e3f9de0e47f56ff96
Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
|
|
|
|
|
|
|
|
|
| |
The matrix_properties benchmark needlessly links against QtScript
causing the build to fail if the QtScript module has not been built yet.
Change-Id: I77b7ada6304daa8c92039e2dc9c1bc76fa99680a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
|
|
|
|
|
|
|
|
| |
In Qt4, qtquick3d had to reinvent a lot of Qt's own build system logic.
In Qt5, modularization makes this unnecessary, so remove it.
Change-Id: I683acba659c1a3842e927262cacd9377cdac7c35
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4.
It enables various crufty undocumented magic, of dubious value.
Stop using it, and explicitly enable the things from it which we want.
References to a nonexistent `unittest' config option were also removed.
Change-Id: I7c5ffe1698946d17a36ccd7edd4287aef7a0de3a
Reviewed-on: http://codereview.qt-project.org/6217
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
|
|
|
| |
Change-Id: I4c0827759fb6e27846d76977ca16c835f98efa15
Reviewed-on: http://codereview.qt.nokia.com/2617
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/3140
|
|
|
|
|
|
|
|
|
|
|
|
| |
We continue with Symbian for the Qt4 program but
since Qt5 support for symbian is not implemented
and if it is will likely look very different,
remove this code for now.
Change-Id: Iced82075e37e3685f7247a7558c298adb54e10ef
Reviewed-on: http://codereview.qt.nokia.com/1863
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
|
|
|
|
|
|
|
|
|
| |
No-one had apparently run it in a while.
Change-Id: I7dd292f322f93c081fb252f847d56b13a5dd3738
Reviewed-on: http://codereview.qt.nokia.com/1198
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sarah Jane Smith
|
|
Fill repo with some of the files from the research/qt3d project. At
present the new project builds under MacOSX. To-dos include getting it
building under linux, windows, harmattan and maemo/meego; updating the
documentation to reflect the new QtQuick focus; and fixing the issues
with private headers.
|