summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-13196-21214/+22645
|\
| * Fix corelib def files for the new atomics implementationShane Kearns2009-11-132-0/+10
| | | | | | | | | | | | | | | | | | | | 4.6.0 has the wrong atomics implementation for symbian, as the team branch was not merged before the freeze. This updates the def files to match the implementation on the team branch so that it can be cherry-picked. Task-number: QTBUG-5752 Reviewed-by: Iain
| * Fix functions that return whether atomics are natives following review commentsShane Kearns2009-11-132-18/+76
| | | | | | | | Reviewed-By: Brad
| * Binary compatibility of Symbian ARMv5 and ARMv6 buildsShane Kearns2009-11-138-39/+586
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ARMv6 atomics where available Use OS atomics otherwise Integrate ARMV6 atomics to Symbian builds Use compiler defined macros to detect if ARMv6 instructions are available This defines the QT_HAVE_ARMV6 macro, replacing the way it was defined by the Symbian build system previously in qpainting.pri. qatomic_symbian now uses qatomic_arm or qatomic_armv6 automatically Port armv6 atomics to implement generic atomics interface The inline atomics are not inlined when we build for thumb using RVCT. So there is no performance improvement of using the "inline" versions vs a shared version called through a function call. The generic atomics interface is good for binary compatibility, as the same symbols are exported in all versions now. Changed the fallback generic atomics implementation from the unix one to a symbian specific one using RFastLock (identical code to the windows generic atomics, except for RFastLock replaces Win32 CRITICAL_SECTION) Note: GCCE atomics still need porting Tell git to ignore .lst listing files (produced by sbs/abld listing) ARMv6 support for GCCE compiler and fallback implementation using OS When building corelib with GCCE and -march=armv6, QT_HAVE_ARMV6 will be defined. This patch adds copies of the asm functions in GCC syntax. When building for the Symbian emulator, or ARMv5, then Symbian OS atomic functions are used as a fallback - these are more efficient than the unix atomics, and don't require data import (which the ARMv5 atomics use, but the OS loader doesn't support fully) Symbian OS functions are always used for QBasicAtomicInt::ref / deref, because these are faster than the generic function in all cases. They are machine coded for ARMv6, and are used internally by RFastLock. Reviewed-By: axis Reviewed-By: Brad
| * Add the ARMv6 inline assembly code for compiling with RVCT.Thiago Macieira2009-11-131-0/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is basically a copy & paste of the GCC inline assembly above, switched to the RVCT inline assembly model (which is actually easier to write and understand). I verified that this code compiles and assembles as expected. The output generated by RVCT is pretty much on the mark. However, I have not executed this code yet to see if it performs as expected. To be noted: - when expanding the inline template code, RVCT may be tempted to switch your entire function to ARM mode. Should we add __attribute__((noinline)) to prevent that? - There's no equivalent to GCC inline assembler's clobber, especially of "memory". Also, there's no "volatile" qualifier to the assembly. Does the compiler know it can't reorder the code? Does it know it shouldn't trust the value of the memory after this? My test indicates the code is fine... Reviewed-By: Shane Kearns
| * Reorganize the qatomic_armv6.h file to receive the RVCT inlineThiago Macieira2009-11-131-81/+90
| | | | | | | | | | | | | | | | | | assembly. Move the *Relaxed, *Acquire and *Release functions (which are simply forwarding calls to the *Ordered version) to the bottom of the file. Reviewed-By: Shane Kearns
| * Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-1329-110/+143
| |\
| | * Fixed a crash when configuring an audio effect with the Phonon dialogThierry Bastian2009-11-121-2/+3
| | | | | | | | | | | | | | | Task-number: QTBUG-5731 Reviewed-by: jan-arve
| | * Merge commit 'widget/4.6' into oslo-staging-2/4.6Olivier Goffart2009-11-1128-108/+140
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qbrush.cpp
| | | * Fixed: QFontComboBox emits the currentFontChanged() signal twiceOlivier Goffart2009-11-111-1/+3
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-2438 Reviewed-by: Thierry
| | | * QAbstractScrollArea: Wheel over a scrollarea that has only one horizontal ↵Olivier Goffart2009-11-112-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scrollbar If the vertical scrollbar is hidden, scroll using the other scrollbar. Reviewed-by: Thierry Task-number: QTBUG-1760
| | | * Small caps font variant wouldn't be used when defined through style sheetsGabriel de Dietrich2009-11-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The font comparison (operator==) didn't check the capital attribute, which is the one responsible for this variant. Now it does. Auto-test updated. Reviewed-by: Samuel Reviewed-by: Olivier
| | | * Fix Font combobox: one can set the current font without it being changedThierry Bastian2009-11-111-0/+7
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5693 Reviewed-by: ogoffart
| | | * QKeySequence::mnemonic: add a warning if the text contains severals '&'Olivier Goffart2009-11-111-4/+16
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5667 Reviewed-by: Gabriel
| | | * Revert "Always set a clip on the painter in QGraphicsView."Andreas Aardal Hanssen2009-11-111-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4bf7f90a27377f439e86d6175e5e3cdebd131be0. The change is already reverted in kinetic-declarativeui. Reviewed-by: Warwick Allison Reviewed-by: bnilsen
| | | * QDockWidget also emits dockLocationChanged when the state is restoredThierry Bastian2009-11-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ...on the main window. Task-number: QTBUG-1304 Reviewed-by: ogoffart
| | | * Make it possible for QMainWindow to restore the geom of undocked widgetThierry Bastian2009-11-101-3/+3
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5663 Reviewed-by: ogoffart
| | | * Fixed: Stylesheet and background image issue in ScrollAreaOlivier Goffart2009-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using background-image and background-attachement: scroll and background-repeat: no-repeat The rectangle used to draw the image was not correctly computed. Reviewed-by: Thierry Task-number: QTBUG-3783
| | | * Menubars in dual screen mode now popup the menus on the correct screenThierry Bastian2009-11-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an item is split then its menu appears on the screen which contains most of it. Task-number: QTBUG-773 Reviewed-by: ogoffart
| | | * Make sure the context menus also clear the status tip when neededThierry Bastian2009-11-104-36/+37
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-2700 Reviewed-by: ogoffart
| | | * Make sure that the toolbar is in the mainwinow rect for dockingThierry Bastian2009-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-2598 Reviewed-by: ogoffart
| | | * PlatformPlugin: Do not load the plugin if there is no GUIOlivier Goffart2009-11-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise valgrind might complain we use uninitialized value (when using the X11 structure) Reviewed-by: Gabriel
| | | * Make the toolbar extension animated according to the main windowThierry Bastian2009-11-103-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it would be always animated. Task-number: QTBUG-5623 Reviewed-by: Gabriel
| | | * Avoid XSync-related runtime crashes on HP-UX due to C++ mangling.Andreas Aardal Hanssen2009-11-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HP-UX is missing the extern "C" wrapper for its XSync function declarations. This caused applications to _build_ but not _run_ (i.e., all GUI apps crashed). Adding the wrapper should be harmless on all X11 platforms. Task-number: QTBUG-5524 Reviewed-by: Thiago
| | | * QGraphicsTextItem: update when changing the color.Olivier Goffart2009-11-091-0/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5418 Reviewed-by: Gabriel
| | | * Fix docs for animation apiLeonardo Sobral Cunha2009-11-092-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All animation api code snippets should use references instead of local variables. Task-number: QTBUG-5616 Reviewed-by: thierry
| | | * Make sure the dock widget is updated when changing closable propertyThierry Bastian2009-11-091-0/+5
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-1665 Reviewed-by: ogoffart
| | | * Now looking for the closer dock area for toolbuttonThierry Bastian2009-11-092-30/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we were looking for the 1st one that fit or was not too far (ie 80px) away. Now we really take the closest one. Task-number: QTBUG-2598 Reviewed-by: ogoffart
| | | * QPlastiqueStyle: Fix painting QTreeView with gradientOlivier Goffart2009-11-091-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When setting a gradian brush as a base for a QTreeWidget (with stylesheet), the branch decoration would be plain black. This is because the color() of a gradient brush is always black. Fix it by using the base brush itself to paint the decoration if the brush is not solid color. Task-number: QTBUG-3816 Reviewed-by: Thierry
| | | * Fix warningsThierry Bastian2009-11-093-2/+3
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Merge commit 'c785d92153d23b836451b0643424b9871bcc4be9' into 4.6-upstreamBradley T. Hughes2009-11-131-0/+5
| |\ \ \
| | * \ \ Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-12159-21232/+21971
| | |\ \ \
| | * | | | Make sure posted events are always sent when calling processEvents() on Win32Bradley T. Hughes2009-11-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After 31f1ff910, posted events could be delayed by a previous call to processEvents(). This causes some tests to randomly fail, so bring back the invariant that processEvents() will always call sendPostedEvents() when called "manually" (i.e. not from exec()). Reviewed-by: Prasanth Ullattil
| * | | | | Fix typo in license headerAlessandro Portale2009-11-1227-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The word 'module' was missing. Reviewed-By: TrustMe
| * | | | | Merge commit 'origin/4.6' into 4.6-ceJoerg Bornemann2009-11-12129-20868/+21517
| |\ \ \ \ \
| | * | | | | Fixed searching and copy/paste from PDF documents.axis2009-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously copy and paste from PDFs made by Qt would paste garbage into the target document, and searching was not possible. The bug happened because the internal buffer would open its data stream in truncate mode rather than append mode, thereby losing content, and producing a slightly corrupted PDF. Task: QTBUG-4912 Task: QTBUG-3661 RevBy: Trond Kjernåsen
| | * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-125-2/+49
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0 src/corelib/tools/qscopedpointer_p.h src/gui/widgets/qlcdnumber.cpp
| | | * | | | doc: Fixed some qdoc errors, numXxx() to xxxCount(), etc.Martin Smith2009-11-111-1/+8
| | | | | | |
| | | * | | | Def files frozen for 4.6.0 RCShane Kearns2009-11-1120-361/+21660
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Espen Riskedal Task-Number: QTBUG-4748
| | | * | | | Switch on DEF filesShane Kearns2009-11-111-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DEF files containing the frozen DLL exports are in use for Symbian OS builds, except developer builds (configured with -developer-build) The reason for this exception is that developer builds export additional private interfaces to allow autotests to inject or monitor the internal data of a class. These autotest exports are not part of the API or the binary interface, so they are excluded from DEF files. Task-number: QTBUG-4436 Reviewed-by: Jason Barron
| | | * | | | Rewind def files to betaShane Kearns2009-11-1119-20979/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Espen Riskedal Task-Number: QTBUG-4748
| | | * | | | Documentation: Adding comments to QHoverEvent classMorten Engvoldsen2009-11-111-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explaining the difference between hover events and enter/leave/move events Task-number: QT-1116 Reviewed-by: Bjørn Erik Nilsen
| | | * | | | exporting QGraphicsEffectSource is requiredDaniel Molkentin2009-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Q3MainWindow and Q3TitleBar depend on it. Reviewed-By: dt Reviewed-By: Alessandro Portale
| | | * | | | Qt covers BC break in SymbianAlessandro Portale2009-11-111-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Workaround: fntstore.h has an inlined function 'COpenFont* CBitmapFont::OpenFont()' that returns a private data member. The header will change between minor SDK versions, thus break BC. But Qt has to build on any SDK version and run on other versions of Symbian OS. Also Qt does not want to deliver that BC to Qt based apps. This hack performs the needed pointer arithmetic to get the right COpenFont* pointer, no matter if the 'Flexible Memory Model' is already supported or not. The author is not proud of this commit. Task-number: QT-2250 Reviewed-by: Iain Reviewed-by: Shane Kearns modified: src/gui/text/qfontdatabase_s60.cpp
| | | * | | | Removed unused public Api from QS60StyleAlessandro Portale2009-11-116-85/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style::setStyleProperty() and QS60Style::styleProperty() were intended as generic property setter/getters, but are not needed anymore. Reviewed-by: Sami Merila modified: src/gui/styles/qs60style.cpp modified: src/gui/styles/qs60style.h modified: src/gui/styles/qs60style_p.h modified: src/gui/styles/qs60style_s60.cpp modified: src/gui/styles/qs60style_simulated.cpp modified: src/s60installs/eabi/QtGuiu.def
| | | * | | | Doc: remove graphics for effects that are no longer in scope.Volker Hilsheimer2009-11-111-1/+11
| | | | | | |
| | | * | | | make qfunctions_wince.h C compatible againJoerg Bornemann2009-11-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: mauricek
| | | * | | | Move QCustomScopedPointer to a private headerHarald Fernengel2009-11-119-70/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The API is internal, so it should live in its private header. The class was introduced during the lifetime of 4.6 (not in 4.5), so the move is binary compatible. Task-number: QTBUG-5617 Reviewed-by: João Abecasis <joao@abecasis.name>
| | | * | | | Code in gui/* should be completely namespacedhjk2009-11-111-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | And not rely on random QT_USE_NAMESPACE being pulled in from *.moc files.
| | | * | | | compile fix for tst_qfile on Windows CEJoerg Bornemann2009-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the signature of QT_OPEN to be the same on all platforms. Reviewed-by: thartman
generated by cgit v0.12 at 2024-12-05 00:03:59 (GMT)