summaryrefslogtreecommitdiffstats
path: root/src/corelib/arch
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1750-50/+50
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Update copyright year to 2011.Jason McDonald2011-01-1050-50/+50
| | | | | | | | Reviewed-by: Trust Me
* | Silence preprocessor warnings about __TARGET_ARCH_ARM not being defined.Thiago Macieira2010-11-011-1/+1
| | | | | | | | Reviewed-by: Bradley T. Hughes
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-262-5/+5
|\ \ | | | | | | | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp
| * \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-252-5/+5
| |\ \ | | |/
| | * Fixed many spelling errors.Rohan McGovern2010-10-252-5/+5
| | |
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-224-5/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_win.cpp src/gui/kernel/qwidget.cpp src/gui/text/qfontengine_ft.cpp
| * | Merge faba550d704312a29d9485bcaaa506331f102301 from 4.7 to master.Olivier Goffart2010-10-071-1/+1
| | | | | | | | | | | | The file had been renamed so git did not merge it properly
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-073-4/+11
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-061-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | * Fixed arm X11 build.Samuel Rødal2010-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Without we get error: invalid conversion from 'const void*' to 'void*' Reviewed-by: Thiago Macieira
| | * | fix for USER: 163 panic found on 5800XMmread2010-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Fixed crash on startup in Symbian debug buildGareth Stockwell2010-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 hybrid heap Symbian udeb build issuesmread2010-10-013-2/+9
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-0510-1/+6452
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/gui/painting/qpdf.cpp
| * | Fixed compile for symbian.Rohan McGovern2010-10-041-1/+1
| | |
| * | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-0410-1/+6452
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * hybrid heap improvement in the disabling of BTracemread2010-09-302-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | Using an inline function for noBTrace() which can be optimised to nothing. Task-number: QT-3967 Reviewed-by: Shane Kearns
| | * Further hybrid heap review changesmread2010-09-301-2/+1
| | | | | | | | | | | | | | | | | | | | | this time, adding a comment to explain a performance improvement Task-number: QT-3967 Reviewed-by: Shane Kearns
| | * hybrid heap further review changesmread2010-09-303-18/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | changing the way enums are declared and used. commenting and restricting export macro changes. improved flagging Task-number: QT-3967 Reviewed-by: Shane Kearns
| | * lower case name for allocator support headermread2010-09-301-0/+0
| | | | | | | | | | | | | | | | | | | | | Using lower case name, as recommended by review comment Task-number: QT-3967 Reviewed-by: Shane Kearns
| | * hybrid allocator integration review updatesmread2010-09-304-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | 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
| | * hybrid allocator tuningmread2010-09-302-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * declaring fast allocation shrink hysteresis valuemread2010-09-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * fast allocator compiling for S60 3.2mread2010-09-304-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | 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
| | * moved fast allocator config to qt_hybridHeap_symbian_p.hmread2010-09-301-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * getting fast allocator to compile on S60 5.0 SDKmread2010-09-306-14/+110
| | | | | | | | | | | | | | | | | | | | | | | | This change adds flagging and definitions necessary to get the fast allocator compiling on 5.0 Task-number: QT-3967 Reviewed-by: Shane Kearns
| | * removing header use not in public SDKsmread2010-09-301-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | 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
| | * added header to arch.primread2010-09-301-1/+2
| | | | | | | | | | | | | | | | | | | | | qt_hybridHeap_symbian_p.h was missing from arch.pri, added. Task-number: QT-3967 Reviewed-by: Shane Kearns
| | * added renamed headermread2010-09-301-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * new allocator tidy up and winscw freezemread2010-09-305-86/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | renamed headers diabaled new allocator for winscw builds, and froze the heap creation export Task-number: QT-3967 Reviewed-by: Shane Kearns
| | * Qt apps to use the Symbian^4 fast allocator in pre-Symbian^4 platformsmread2010-09-3012-3615/+5619
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Enable call stack tracing of allocs, for memory leak debuggingShane Kearns2010-09-303-21/+55
| | | | | | | | | | | | | | | Task-number: QT-3967 Reviewed-by: mread
| | * Fix BTRACE loggingShane Kearns2010-09-302-112/+77
| | | | | | | | | | | | | | | Task-number: QT-3967 Reviewed-by: mread
| | * Implement RNewAllocator::Available for Doug Lea sectionShane Kearns2010-09-302-7/+11
| | | | | | | | | | | | | | | Task-number: QT-3967 Reviewed-by: mread
| | * Fill in some of the missing functionsShane Kearns2010-09-301-5/+24
| | | | | | | | | | | | | | | Task-number: QT-3967 Reviewed-by: mread
| | * Fix bug where negative numbers are cast to unsigned and added as an offsetShane Kearns2010-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | It worked, but relied on integer overflow and casting behaviour Task-number: QT-3967 Reviewed-by: mread
| | * Code cleanupShane Kearns2010-09-304-19/+22
| | | | | | | | | | | | | | | Task-number: QT-3967 Reviewed-by: mread
| | * Add the new allocator to corelibShane Kearns2010-09-304-1/+4300
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New export in corelib that is called from the qtmain wrapper to setup the thread heap. This allows 7k of code to be shared, and makes it easier to disable or upgrade the allocator in future releases Task-number: QTBUG-4895 Enable new allocator by default Rename of headers as _p.h to avoid syncqt adding them to applications move inline functions from .inl -> .h, document & rename macros remove #if 0 from the dla header, implement getpagesize properly squashed after sanitisation Task-number: QT-3967 Reviewed-by: mread
| * | Compile when detecting ARMv5Bradley T. Hughes2010-09-271-1/+1
| | | | | | | | | | | | | | | The macro is called QT_END_INCLUDE_HEADER, not QT_END_INCLUDE_HEADERS (no trailing S).
* | | Compile when detecting ARMv5Bradley T. Hughes2010-09-271-1/+1
| | | | | | | | | | | | | | | The macro is called QT_END_INCLUDE_HEADER, not QT_END_INCLUDE_HEADERS (no trailing S).
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-09-278-434/+629
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: configure src/corelib/global/qglobal.h
| * | Add support for ARMv7 atomic operationsBradley T. Hughes2010-09-234-53/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ARMv7 adds the DMB (data memory barrier) instruction which we can use to enforce memory barriers in QAtomicInt and QAtomicPointer. Other than that, ARMv7 is identical to ARMv6. Adjust the ARMv6 code to relax the compiler memory barriers on the *Relaxed() operations, and use *Relaxed() functions together the appropriate compiler barriers in the *Acquire(), *Release(), and *Ordered() functions. For "pure" ARMv6 code, the barriers are only compiler barriers, but for ARMv7, we also emit the DMB instruction. Reviewed-by: thiago
| * | Merge the armv6 and arm architecturesBradley T. Hughes2010-09-234-385/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of having multiple architectures, merge them and select the appropriate implementation based on what the compiler actually supports. The original qatomic_arm.h header has been renamed to qatomic_armv5.h, and qatomic_arm.h now does nothing more than including either qatomic_armv6.h or qatomic_armv5.h Since this changes the build-key for targets that previously used armv6, we need a 3rd compatibility build-key for the architecture. The configure script will always write out this build-key when building for arm (and silently converts -arch armv6 to -arch arm). Reviewed-by: thiago
| * | Copy src/corelib/arch/qatomic_arm.h to src/corelib/arch/qatomic_armv5.hBradley T. Hughes2010-09-231-0/+431
| | | | | | | | | | | | | | | | | | ... in preparation for the next commit Reviewed-by: thiago
| * | Move symbian specific qatomic_generic_armv6.cppBradley T. Hughes2010-09-232-1/+1
| |/ | | | | | | | | | | Put it in src/corelib/arch/symbian/ instead of src/corelib/arch/armv6/ Reviewed-by: thiago
* | Merge remote branch 'qt/4.7' into lighthousePaul Olav Tvete2010-06-181-6/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/common/qws.conf src/corelib/io/qresource.cpp src/gui/image/qpixmapdata_p.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/opengl/qgl_p.h src/plugins/mediaservices/gstreamer/gstreamer.pro
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-271-6/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/spectrum/app/engine.h demos/spectrum/app/mainwidget.h demos/spectrum/app/settingsdialog.h demos/spectrum/app/spectrograph.h demos/spectrum/app/spectrumanalyser.h demos/spectrum/app/tonegenerator.h demos/spectrum/app/tonegeneratordialog.h demos/spectrum/app/utils.h demos/spectrum/app/waveform.h tests/auto/qtextcodec/tst_qtextcodec.cpp
| | * QTBUG-5955: Qt fails to build on alpha architectureFathi Boudra2010-05-251-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | - add alpha platform support based on JavaScriptCore from src/3rdparty/webkit copy. - fix invalid type conversions on alpha architecture. Merge-request: 640 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | Say hello to Qt for Native Client.Morten Johan Sørvig2010-05-141-0/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | This commits adds build system to support for the native client compiler (x86-only for now), sets up global defines, and adds compile fixes for QtCore and QtGui. Details: * Add mkspecs for linux-nacl-g++ and macx-nacl-c++ * Add nacl configure option * Add qconfig-minimal-system-dependencies.h * Define Q_OS_NACL in qglobal.h * Add qnacalunimplemented.h/cpp with POSIX stubs. * .pro file changes for cross-compiling on Mac
generated by cgit v0.12 at 2025-08-31 06:55:55 (GMT)