| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
The lack of const results in a compile error when compiling 32-bit Qt
in a 64-bit machine (-platform linux-g++-32 -xplatform linux-g++-32).
Adding const is safe since expected and newval parameters are not modified
by qatomic_i386.s.
Task-Number: QTBUG-22479
Change-Id: Iee9f73b9bed777177aeae34bfcedb2feac83e67a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
| |
Fixes errors in INTEGRITY qatomic pointer and int templates and
wrongly defined IS_WAIT_FREE's & IS_NATIVE's
Change-Id: I1ab0236bb4979c0fda6a075ca82ee618a6da40e1
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
| |
Now passes atomicpointer autotest successfully.
Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
|
|
|
|
| |
Merge-Request: 1291
Reviewed-by: Liang Qi <liang.qi@nokia.com>
|
|
|
|
|
| |
Task-number: QTBUG-16402
Rubber-stamped-by: Thiago Macieira
|
|
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit 774a3536b00c4d6e4c4c10b708e31b4373a338e3)
|
| |
|
|
|
|
|
|
|
| |
Added atomic operations using INTEGRITY native APIs
Merge-request: 1101
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
|\
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix compilation error with ARMv5 atomics when T is a const value.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Error was:
../../include/QtCore/../../src/corelib/arch/qatomic_armv5.h:301: error:
invalid conversion from 'const void*' to 'void*'
faba550d704312a29d9485bcaaa506331f102301 introduced the fix to 4.7,
but since the file was renamed in 4.8, the merge didn't apply. The
conflict resolution in 91efdcae was incomplete.
Reviewed-by: Harald Fernengel
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
| |
The Qt fast allocator should be used on any Symbian platform where it
is not supplied by euser. But it's better if the code is not there when
euser provides the fast allocator as euser's implementation will be
better maintained.
The previous flag SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS was only associated
with euser's fast allocator in S60 10.1. __SYMBIAN_KERNEL_HYBRID_HEAP__
is more accurately associated with it in the new MCL.
Task-number: QTBUG-15901
Reviewed-by: Miikka Heikkinen
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/webkit/imageanalyzer/imageanalyzer.h
examples/webkit/imageanalyzer/mainwindow.h
mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h
src/corelib/io/qfsfileengine_iterator_unix.cpp
src/corelib/io/qfsfileengine_iterator_win.cpp
src/corelib/kernel/qcoreapplication.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/plugins/bearer/connman/qconnmanservice_linux.cpp
src/plugins/platforms/openvglite/qwindowsurface_vglite.h
src/s60installs/bwins/QtCoreu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/s60installs.pro
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qdoc3/test/qt-html-templates.qdocconf
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: Bradley T. Hughes
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
src/opengl/qwindowsurface_gl.cpp
|
| |\ \
| | |/ |
|
| | | |
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/kernel/qapplication_win.cpp
src/gui/kernel/qwidget.cpp
src/gui/text/qfontengine_ft.cpp
|
| | |
| | |
| | |
| | | |
The file had been renamed so git did not merge it properly
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msbuild_objectmodel.h
qmake/generators/win32/msvc_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
src/corelib/arch/qatomic_arm.h
tests/auto/qglthreads/tst_qglthreads.cpp
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Adding a threshold for partial updates.
Fixed arm X11 build.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Without we get error: invalid conversion from 'const void*' to 'void*'
Reviewed-by: Thiago Macieira
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The NO_NAMED_LOCAL_CHUNKS macro should have been set for S605.0 builds.
Also for S60 3.2 and Symbian^2. All are added.
Reviewed-by: Shane Kearns
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This fixes a typo in a debug-only function in the hybrid heap
allocator. The typo causes an assertion to fail during startup
of applications, when using a debug build of Qt.
Reviewed-by: mread
|
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fixed name collision with TAllocFail
Added definition for EDebugHdrSize and fixed scope issue
Added definition for SRAllocatorBurstFail
Added a definition for global enum ETHeapBadDebugFailParameter
Tested compilation on:
Symbian^3 RnD - armv5_urel, armv5_udeb, winscw_urel, winscw_udeb
S60 3.1 SDK - armv5_urel, armv5_udeb
S60 5.0 SDK - armv5_urel, armv5_udeb
Symbian^3 PDK - armv5_urel, armv5_udeb
Symbian^4 RnD - armv5_urel, armv5_udeb
Basic functional testing on N8 armv5_urel
Task-number: QTBUG-14168
Reviewed-by: Shane Kearns
|
|\ \ \
| |/ /
| | |
| | |
| | | |
Conflicts:
src/gui/painting/qpdf.cpp
|
| | | |
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/snippets/code/doc_src_qmake-manual.qdoc
src/corelib/arch/symbian/arch.pri
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
tests/auto/qfontmetrics/tst_qfontmetrics.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Using an inline function for noBTrace() which can be optimised to
nothing.
Task-number: QT-3967
Reviewed-by: Shane Kearns
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
this time, adding a comment to explain a performance improvement
Task-number: QT-3967
Reviewed-by: Shane Kearns
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
changing the way enums are declared and used.
commenting and restricting export macro changes.
improved flagging
Task-number: QT-3967
Reviewed-by: Shane Kearns
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Using lower case name, as recommended by review comment
Task-number: QT-3967
Reviewed-by: Shane Kearns
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Disabling BTrace use in the heap checking macros without disabling any
of the rest of the heap checking functionality.
Task-number: QT-3967
Reviewed-by: Shane Kearns
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Set various pragmas and defines to tune the hybrid allocator.
Performance test was the time takes to allocate or deallocate as
appropriate 1,000,000 times from a set of 100,000 pointers, selected at
random, with sizes generated randomly with min 2, max 5960, avg 46.
The function was exp(8 - log(2 + rand(0..1023))) * rand(1 or 4).
The following parameters were chosen:
* pragma arm, for ~1.2%
* pragma Otime, for ~3%
* pragma O2, already the compiler default, just to be sure
* all possible slab sizes enabled, for ~1%
NB Disabling BTrace would also gain ~1.5%, but that seems like a bad
thing to do. Not done.
Task-number: QT-3967
Reviewed-by: Shane Kearns
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The allocator code copied from 10.1 would have no default value set for
KHeapShrinkHysRatio, since it's no longer a patchable constant. This
change gives it a value of 0x800, to be tuned for performance.
Task-number: QT-3967
Reviewed-by: Shane Kearns
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The fast allocator on S60 3.2 can't use TChunkCreateInfo. Instead,
RChunk::CreateDisconnectedLocal() has to be used
Task-number: QT-3967
Reviewed-by: Shane Kearns
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The fast allocator switch was in qglobal.h, which is unnessarily global.
Instead it has been moved to qt_hybridHeap_symbian_p.h, where is has
the minimum visibility required.
Task-number: QT-3967
Reviewed-by: Shane Kearns
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This change adds flagging and definitions necessary to get the fast
allocator compiling on 5.0
Task-number: QT-3967
Reviewed-by: Shane Kearns
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
u32exec.h was not available in the symbian^3 SDK, so it has been removed
and other necessary headers are added.
Task-number: QT-3967
Reviewed-by: Shane Kearns
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
qt_hybridHeap_symbian_p.h was missing from arch.pri, added.
Task-number: QT-3967
Reviewed-by: Shane Kearns
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
qt_hybridHeap_symbian_p.h was renamed from qt_hybridHeap_symbian.h to
make it clear that it's private/internal. But it hadn't been added to
git. Now it is.
Task-number: QT-3967
Reviewed-by: Shane Kearns
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
renamed headers
diabaled new allocator for winscw builds, and froze the heap creation
export
Task-number: QT-3967
Reviewed-by: Shane Kearns
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The hybrid heap allocator has been copied from Symbian^4 (MCL wk36
initially) and is installed by qtmain.lib as the initial allocator
for Qt apps.
Task-number: QT-3967
Reviewed-by: Shane Kearns
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QT-3967
Reviewed-by: mread
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QT-3967
Reviewed-by: mread
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QT-3967
Reviewed-by: mread
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QT-3967
Reviewed-by: mread
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It worked, but relied on integer overflow and casting behaviour
Task-number: QT-3967
Reviewed-by: mread
|