summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-123-60/+60
|\ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Show EditorDateEdit before changing selection in qdatetimeedit test Moved runonphone target to prf files for all build systems. Incorrectly named keys in QS60StyleEnums::SkinParts Fix recursive targets for src.pro Fix recursive 'make sis' for symbian builds Fixed destdir not being defined. Enable runonphone target for libraries as well.
| * Incorrectly named keys in QS60StyleEnums::SkinPartsSami Merila2010-06-113-60/+60
| | | | | | | | | | | | | | | | | | | | | | Some of the internal part names of QS60Style do not match the real theme item names, making automated tool use to make "theme blob" for QCreator simulator manual work. Renamed the parts to match native side names. Task-number: QTBUG-11053 Reviewed-by: Alessandro Portale
* | Fixed an on-exit crash for apps using GL.Trond Kjernåsen2010-06-116-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | If a QGLWidget is left on the heap when the QApplication destructor is called, it will leave the QGLWidget in a broken state. The widget itself is released and set to a non-created state, which the associated QGLContext doesn't get notified about. With this patch the QGLWidget knows when QWidget::destroy() is called and can act acordingly. Task-number: QT-3498, QTBUG-10995 Reviewed-by: Paul
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-1026-122/+289
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (26 commits) QWidget::childAt for masked child widgets doesn't work properly Optimized 90-, 180-, and 270- rotated blits in raster paint engine. Rename QLocale::isWrittenRightToLeft() to textDirection() Fixed some bugs in detection of keyboard directionality Add a isWrittenRightToLeft() method to QLocale. consistent handling of directionality in QTextLayout For an empty line edit the cursor position is depending on input language correctly initialize the bidi level in the text engine Use the textDirection() of blocks correctly. Add QTextBlock::textDirection() Make sure LayoutDirectionAuto is the default text direction LayoutDirectionAuto is the default layout direction for QPainter Correct BiDi behavior of QLineEdit The default text direction for QTextOption is Qt::LayoutDirectionAuto Handle setting the layoutDirection to Qt::LayoutDirectionAuto Introduce LayoutDirection Qt::LayoutDirectionAuto Fix QString::isRightToLeft() to conform with Unicode Bidi algorithm small optimisation QVarLenghtArray: Add typedefs for stl compatibility. prefer QElapsedTimer over QTime ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-1026-122/+289
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (26 commits) QWidget::childAt for masked child widgets doesn't work properly Optimized 90-, 180-, and 270- rotated blits in raster paint engine. Rename QLocale::isWrittenRightToLeft() to textDirection() Fixed some bugs in detection of keyboard directionality Add a isWrittenRightToLeft() method to QLocale. consistent handling of directionality in QTextLayout For an empty line edit the cursor position is depending on input language correctly initialize the bidi level in the text engine Use the textDirection() of blocks correctly. Add QTextBlock::textDirection() Make sure LayoutDirectionAuto is the default text direction LayoutDirectionAuto is the default layout direction for QPainter Correct BiDi behavior of QLineEdit The default text direction for QTextOption is Qt::LayoutDirectionAuto Handle setting the layoutDirection to Qt::LayoutDirectionAuto Introduce LayoutDirection Qt::LayoutDirectionAuto Fix QString::isRightToLeft() to conform with Unicode Bidi algorithm small optimisation QVarLenghtArray: Add typedefs for stl compatibility. prefer QElapsedTimer over QTime ...
| | * QWidget::childAt for masked child widgets doesn't work properlyBjørn Erik Nilsen2010-06-102-31/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem was that we didn't take the children's effective mask into account when checking whether a point was inside or not. This commit is also an optimization since we no longer check the point against the widget's rect twice. Furthermore, unnecessary QRegion operations are completely avoided in the common case. Auto tests included. Task-number: QTBUG-7150 Reviewed-by: paul
| | * Optimized 90-, 180-, and 270- rotated blits in raster paint engine.Samuel Rødal2010-06-101-0/+105
| | | | | | | | | | | | | | | | | | | | | | | | Blitting a 90-degree rotated RGB16 image now takes 40 % of the time it used to on the N900. Task-number: QT-3057 Reviewed-by: Kim
| | * Rename QLocale::isWrittenRightToLeft() to textDirection()Lars Knoll2010-06-094-4/+4
| | | | | | | | | | | | | | | | | | This is more in line with the rest of Qt. Reviewed-by: Simon Hausmann
| | * Fixed some bugs in detection of keyboard directionalityLars Knoll2010-06-095-51/+18
| | | | | | | | | | | | | | | | | | | | | | | | The mapping table on X11 had a few bugs. Implemented rudimentary support on QWS and fixed a tiny issue on Mac. Reviewed-by: Simon Hausmann
| | * consistent handling of directionality in QTextLayoutLars Knoll2010-06-093-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | Make sure we use the same method to determine RTL/LTR for the layout everywhere. Task-number: Part of QT-3292 Reviewed-by: Simon Hausmann
| | * For an empty line edit the cursor position is depending on input languageLars Knoll2010-06-091-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Ensure the cursor is on the right if the keyboard layout is for a right to left language. Task-number: Part of Qt-3292 Reviewed-by: Simon Hausmann
| | * correctly initialize the bidi level in the text engineLars Knoll2010-06-091-2/+15
| | | | | | | | | | | | | | | | | | | | | If the text options doesn't specify the layout direction, determine it from the content. Reviewed-by: Simon Hausmann
| | * Use the textDirection() of blocks correctly.Lars Knoll2010-06-094-14/+7
| | | | | | | | | | | | | | | Task-number: Part of QT-3292 Reviewed-by: Simon Hausmann
| | * Add QTextBlock::textDirection()Lars Knoll2010-06-092-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | The method returns the resolved text direction for the block. It implements P1-P3 of the Unicode bidi algorithm. Task-number: Part of Qt-3292 Reviewed-by: Simon Hausmann
| | * Make sure LayoutDirectionAuto is the default text directionLars Knoll2010-06-091-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTextFormat::intProperty requires a small change to ensure we return the right value for layoutDirection. No need to change QTextFormat::property, as an invalid QVariant will be returned if the layoutDirection is not explicitly set. Reviewed-by: Simon Hausmann
| | * LayoutDirectionAuto is the default layout direction for QPainterLars Knoll2010-06-091-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Don't retrieve the layout direction from QWidget or QApplication anymore. Respect if somebody explicitly sets the direction with setLayoutDirection(). Task-number: Part of QT-3292 Reviewed-by: Simon Hausmann
| | * Correct BiDi behavior of QLineEditLars Knoll2010-06-092-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | * LayoutDirectionChange event doesn't affect the text anymore. * Default text direction is determined from string * Qt::Key_Direction_L/R forces the layout direction Task-number: Part of Qt-3292 Reviewed-by: Simon Hausmann
| | * The default text direction for QTextOption is Qt::LayoutDirectionAutoLars Knoll2010-06-092-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change is binary compatible, even though the changed bitfield is being accessed inline. The reason is that we extend by a bit that has previously been initialized to 0. bitordering will ensure that old code reads Qt::LayoutAuto as Qt::LeftToRight. Task-number: Part of QT-3292 Reviewed-by: Simon Hausmann
| | * Handle setting the layoutDirection to Qt::LayoutDirectionAutoLars Knoll2010-06-092-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Setting it to LayoutAuto will be ignored on an application level (only LeftToRight or RightToLeft are valid). On a widget level is does the same as calling unsetLayoutDirection(). Reviewed-by: Simon Hausmann
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-083-3/+3
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QVarLenghtArray: Add typedefs for stl compatibility. prefer QElapsedTimer over QTime Allow to build Qt in static with mingw Protected call to glXChooseFBConfig with appropriate defines. Use the new OpenGL 3.* context/profile if asked with X11/GLX. Splitted attrib_list generation into buildSpec from QGLContext::tryVisual. Fix QTransform::map(const QPainterPath &) not working with paths that
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-083-3/+3
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Allow to build Qt in static with mingw Protected call to glXChooseFBConfig with appropriate defines. Use the new OpenGL 3.* context/profile if asked with X11/GLX. Splitted attrib_list generation into buildSpec from QGLContext::tryVisual. Fix QTransform::map(const QPainterPath &) not working with paths that
| | | | * Allow to build Qt in static with mingwThierry Bastian2010-06-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some functions were marked with Q_DECL_IMPORT where they should just be Q_CORE_EXPORT. The reason is that this macro is expanded to nothing in case of static builds whereas Q_DECL_IMPORT isn't (it is a dllimport). That leads the linker to try to import it and it shouldn't. Task-number: QTBUG-10791 Reviewed-by: gabi
| | | | * Fix QTransform::map(const QPainterPath &) not working with paths thatSimon Hausmann2010-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | have only one element Replaced the isEmpty() check for the shortcut in map() with elementCount() == 0 Task-number: QTBUG-11264 Reviewed-by: Samuel
* | | | | QS60Style: QComboBox displays checkboxes for itemsSami Merila2010-06-101-1/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QComboMenuDelegate claims that all combobox menu items should be checkable even if they aren't. In all the other styles, it has been circumvented in the style code that this particular setting from QComboMenuDelegate is ignored. :) Adding the same workaround to QS60Style as well. Task-number: QTBUG-11322 Reviewed-by: Alessandro Portale
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Toby Tomkins2010-06-1011-34/+124
|\ \ \ \ | |/ / / | | | | | | | | 4.7-multimedia
| * | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-06-0811-34/+124
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp src/3rdparty/webkit/WebKit/qt/ChangeLog src/gui/painting/qpainter.cpp src/gui/painting/qtextureglyphcache.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtNetworku.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qfontmetrics/tst_qfontmetrics.cpp tools/linguist/lupdate/main.cpp
| | * | Fix style sheet error with slider handleqCaro2010-06-071-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Olivier
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-037-26/+114
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix QWS build failure Removed compiler warnings Window visibility changes update TLW backing store reference count Enable visibility change events on all Symbian native windows Added reference counting to QWidgetBackingStore Added tst_QWidget::destroyBackingStoreWhenHidden
| | | * | Fix QWS build failureGareth Stockwell2010-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8697
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-037-25/+113
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Removed compiler warnings Window visibility changes update TLW backing store reference count Enable visibility change events on all Symbian native windows Added reference counting to QWidgetBackingStore Added tst_QWidget::destroyBackingStoreWhenHidden
| | | | * | Window visibility changes update TLW backing store reference countGareth Stockwell2010-06-021-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * When a native window becomes completely invisible, the reference count of the top-level widget's backing store is decremented. * When a previously invisible native window becomes either partially or fully visible: - If the top-level widget has a backing store, its reference count is incremented. - Otherwise, the top-level widget creates a backing store with an initial reference count of 1. Task-number: QTBUG-8697 Reviewed-by: Jason Barron
| | | | * | Enable visibility change events on all Symbian native windowsGareth Stockwell2010-06-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, these events were enabled only on top-level widgets. This patch enables them also for native child widgets. Task-number: QTBUG-8697 Reviewed-by: Jason Barron
| | | | * | Added reference counting to QWidgetBackingStoreGareth Stockwell2010-06-027-20/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Symbian, the top-level widget's backing store must be destroyed when it is no longer required, in order to conserve memory. The criteria for destroying the backing store is when neither the TLW nor any of its native descendents (which share the backing store) are visible. In order to implement this requirement, a count must be kept of the number of native widgets which are using the TLW's backing store. This patch provides the mechanism for maintaining this count, and for destroying the backing store when the count is decremented to zero. No calls to either the increment nor decrement functions are made, however, by this code included in this patch; this code will be added to only the Symbian backend by a subsequent patch. Task-number: QTBUG-8697 Reviewed-by: Bjørn Erik Nilsen Reviewed-by: Jason Barron
| | * | | | Windows CE: missing null check added in qapplication_win.cppJoerg Bornemann2010-06-021-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents possible crash on WM_SETTINGCHANGE. Task-number: QTBUG-11023 Reviewed-by: ckamm
| | * | | Fixed alpha check for mono images.Kim Motoyoshi Kalland2010-06-011-0/+2
| | |/ / | | | | | | | | | | | | | | | | Task-number: QTBUG-9072 Reviewed-by: Trond
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-311-4/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Always construct s60 screen furniture even if not used.
| | | * | Always construct s60 screen furniture even if not used.Janne Koskinen2010-05-311-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not creating screen furniture in full screen caused regression when swapping into idle screen and back on Nokia 5800. Task-number: QTBUG-10985 Reviewed-by: Jason Barron
| | * | | Fix antialiasing with transformed text in OpenGL2 paint engineEskil Abrahamsen Blomfeldt2010-05-312-3/+5
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the paint engine now transforms the prerendered glyphs instead of rendering transformed glyphs as paths, we need to turn on texture filtering to avoid antialiasing artifacts. In order to do this, we also need to pad the glyphs in the glyph cache, otherwise you will get artifacts when sampling the area around the glyph's bounding rect (where there might be other glyphs.) This done by adding a glyphPadding() function to the cache which returns the number of pixels to pad between each glyph. Updated: This also fixes a general issue where some combinations of font sizes and transformations will cause the engine to sample neighbouring glyphs, so this has been backported to Qt 4.6.x. Task-number: QTBUG-9706, QTBUG-11028 Reviewed-by: Tom Conflicts: src/gui/painting/qtextureglyphcache.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-273-4/+7
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix regression with Qt::AlignRight on monospaced text in QTextLayout Back port change d85b149a5c7f3532f8e1a593a79298c9ae38a95f
| | | * | Fix regression with Qt::AlignRight on monospaced text in QTextLayoutEskil Abrahamsen Blomfeldt2010-05-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For monospaced fonts, using the width (including the bearing) of the text to align it to the right hand side, will break alignment of columns of characters. To fix the problem, we go back to the old procedure, by using the advance of the text as basis of alignment instead. Done-by: thorbjorn Reviewed-by: Eskil
| | | * | Back port change d85b149a5c7f3532f8e1a593a79298c9ae38a95fEskil Abrahamsen Blomfeldt2010-05-273-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes right alignment of monospaced text, which was a regression in Qt 4.6.0. Initially it was fixed in Qt 4.7 only, but the regression was later deemed severe enough to fix in 4.6.x as well. Task-number: QTBUG-8864 Reviewed-by: thorbjorn
| | * | | Post QResizeEvent from QSymbianControl::SizeChanged even when invisibleGareth Stockwell2010-05-271-0/+3
| | |/ / | | | | | | | | | | | | | | | | Task-number: QTBUG-10986 Reviewed-by: Jason Barron
* | | | Problems with missing symbols on QWS/AIX. Include freetype synthesis file ↵Toby Tomkins2010-06-101-0/+1
|/ / / | | | | | | | | | | | | | | | for cross-compilation. Reviewed-by: Rohan McGovern
* | | New keys for media-related keys, common mobile keysIain2010-06-071-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Various new keys: - introduce a proper key for pausing media - the existing Key_Pause was mapped to the Pause/Break key on a QWERTY keyboard. (In order not to break BC on applications that have been using the directfb keyboard map, the key mapping for DIKS_PLAYPAUSE *was not* updated). - introduce explicit keys to handle the case where play/pause is a single (toggling state) key rather than two discrete keys; same thing for a toggling version of call/hangup. - add new keys for voice dial and last number redial NOTE: Due to renumbering Key_Camera and Key_CameraFocus in order to make space in the more mobile-specific key range, this change introduces a binary compatibility break between this change and anything built before (ie. with Qt 4.7 beta 1 or earlier) (But not Qt 4.6, since the camera and camera focus keys were not in 4.6) Reviewed-by: axis Reviewed-by: Shane Kearns
* | | Retrieve proper glyph outlines from Symbian^4Alessandro Portale2010-06-072-2/+103
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Up until Symbian^4, the Symbian font Api does not provide access to the vector data of glyphs. In order to make QPainterPath::addText() and transformed text rendering work, Qt falls back to a workaound: Tracing the bitmap of a rasterized glyph. That is neither performant nor is the result of good quality. Symbian^4 will add Api that returns glyph outlines encoded as SVG paths. The code in this commit essentially parses the SVG path and returns a QPainterPath. The parsing part took some ideas from QSvg, and is implemented in a very reduced way. Task-number: QT-809 Reviewed-by: Aleksandar Sasha Babic
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-042-44/+70
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add a note to the Linguist docs stating XLIFF 1.0 is not supported remove spurious empty lines in the linguist tools' output don't use qWarning() - or even qFatal()! - gratuitously. Styled item view backgrounds in Gtk+ Ensure that we only have one QLayoutStruct struct by renaming the other
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-042-44/+70
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: remove spurious empty lines in the linguist tools' output don't use qWarning() - or even qFatal()! - gratuitously. Styled item view backgrounds in Gtk+ Ensure that we only have one QLayoutStruct struct by renaming the other
| | * | Styled item view backgrounds in Gtk+Jens Bache-Wiig2010-06-031-15/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were currently never themed but used a fake gradient to mimick ClearLooks. I had to add a workaround for the case where you were using custom QItemDelegates since this could result in styled background on tree branches but flat items. Task-number: QTBUG-11209 Reviewed-by: thorbjorn
| | * | Ensure that we only have one QLayoutStruct struct by renaming the otherAndy Shaw2010-06-031-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since QTextDocumentLayout and QLayoutEngine code referred to their own instances of QLayoutStruct it was causing problems with the Visual Studio debugger as it kept confusing the two together. Reviewed-by: Eskil
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-0440-11/+191
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: tst_qgraphicsitem: stabilize on X11 Added OpenGL 3.3 and 4.0 recognition to QGLFormat Fix compilation: disable -no-feature-* for bootstrapped QString: Fix severals bugs when comparing with QStringRef QProgressBar: make accessors const. Changes: add patch for artificial emboldening Added static version of QGLFramebufferObject::release(). Fix compilation on WinXP MinGW32; Add a new qconfig feature GESTURES