summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix compilation: disable -no-feature-* for bootstrappedTasuku Suzuki2010-06-031-0/+8
| | | | | | | moc isn't compiled when qt is configured if -no-feature-datestring Merge-request: 2347 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
* QString: Fix severals bugs when comparing with QStringRefOlivier Goffart2010-06-032-4/+40
| | | | | | | | | | | | | the internal ucstricmp and ucstrcmp contains different bugs if the strings are not 0-terminated, as it is with QStringRef. - in ucstricmp, even if the pointer are the same, the lenght could be different - we used to deference the 'end' pointer, that would be 0 if the string ends with 0, but we cannot do that in the general case Task-number: QTBUG-10404 Reviewed-by: Denis
* QProgressBar: make accessors const.Olivier Goffart2010-06-031-2/+4
| | | | | Task-number: QTBUG-11039 Reviewed-by: Thierry
* Changes: add patch for artificial emboldeningMike FABIAN2010-06-022-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Details: Fixes http://bugreports.qt.nokia.com/browse/QTBUG-10596 Patch taken from https://bugzilla.novell.com/show_bug.cgi?id=374066 https://bugzillafiles.novell.org/attachment.cgi?id=232442 and http://code.google.com/p/gentoo-taiwan/source/browse/trunk/x11-libs/qt-gui/files/synthetic-bold-4.5.diff?spec=svn298&r=298 and slightly edited. Moving the two lines concerning the underlining is unrelated to the emboldening but seems to make sense anyway, the comment "//underline metrics" seems to be misplaced before the "if (FT_IS_SCALABLE(face)) {| The hunk: @@ -789,6 +794,7 @@ QFontEngineFT::Glyph *QFontEngineFT::loadGlyphMetrics(QGlyphSet *set, uint glyph } FT_GlyphSlot slot = face->glyph; + if (embolden) FT_GlyphSlot_Embolden(slot); int left = slot->metrics.horiBearingX; int right = slot->metrics.horiBearingX + slot->metrics.width; int top = slot->metrics.horiBearingY; seems to be logical but it is apparently not used when running my test program, i.e. synthetic emboldening in my test program works even without this hunk. Merge-request: 635 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Added static version of QGLFramebufferObject::release().Kim Motoyoshi Kalland2010-06-022-0/+32
| | | | | | The function is marked internal for now. Reviewed-by: Gunnar
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-0249-11/+218
|\ | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix compilation on WinXP MinGW32; Add a new qconfig feature GESTURES
| * Fix compilation on WinXP MinGW32;lit-uriy2010-06-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this change, I get an error when building plug QODBC: drivers\odbc\qsql_odbc.cpp: In function 'QString qODBCWarn(const QODBCPrivate*, int*)': drivers\odbc\qsql_odbc.cpp:264: error: 'class QStringBuilder<QStringBuilder<QStringBuilder<QStringBuilder<QString, QLatin1Char>, QString>, QLatin1Char>, QString>' has no member named 'simplified' drivers\odbc\qsql_odbc.cpp: In function 'QString qODBCWarn(const QODBCDriverPrivate*, int*)': drivers\odbc\qsql_odbc.cpp:270: error: 'class QStringBuilder<QStringBuilder<QString, QLatin1Char>, QString>' has no member named 'simplified' drivers\odbc\qsql_odbc.cpp: In function 'QString qGetStringData(void*, int, int, bool)': drivers\odbc\qsql_odbc.cpp:403: warning: comparison between signed and unsigned integer expressions drivers\odbc\qsql_odbc.cpp:444: warning: comparison between signed and unsigned integer expressions Env: Windows XP SP2 MinGW (GCC 4.4.0 from trolls ftp) Merge-request: 2402 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| * Add a new qconfig feature GESTURESTasuku Suzuki2010-06-0248-9/+216
| | | | | | | | | | Merge-request: 535 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-014-10/+94
|\ \ | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Introduced getter and setter for the visual X cursor position. Defines whether the cursor should keep its current position.
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-014-10/+94
| |\ \ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Introduced getter and setter for the visual X cursor position. Defines whether the cursor should keep its current position.
| | * | Introduced getter and setter for the visual X cursor position.Roberto Raggi2010-06-012-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mechanism allows the cursor to move up and down on a visually straight line with proportional fonts, and to gently "jump" over short lines. Reviewed-by: mae
| | * | Defines whether the cursor should keep its current position.Roberto Raggi2010-06-014-10/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Defines whether the cursor should keep its position when text gets inserted at the current position of the cursor. For example, we don't want QTextCursor to extend the selection when inserting characters at the end of an extra selection representing a user-type but we do want the selection to grow when rewriting a region of code (e.g. when using our QuickFix engine). Task-number: QTBUG-11075 Reviewed-by: mae
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-017-51/+65
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Don't remove the pixmap from cache when not modifying it. Speed up QStaticText with affine transformation on GL2 engine
| * | Don't remove the pixmap from cache when not modifying it.Andreas Aardal Hanssen2010-06-011-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Fixes one minor regression in the last commit to QGraphicsIten::scroll: if the expose region doesn't intersect with the cache pixmap, then there's no point in removing it. Reviewed-by: Alexis Menard <alexis.menard@nokia.com>
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-06-0149-290/+716
| |\ \ | |/ / |/| |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-017-78/+148
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: Fixed a typo Doc: QAbstractItemModel: note unexpected behavior with beginMoveRows Added environment variable graphicssystem switch. Fixed a problem where QPixmaps where re-bound in non-sharing contexts. Fix bug in QGraphicsItem::scroll() when called with no QRectF argument. Make sure we don't pull inn /usr/X11 stuff in the qws mkspek conf Avoid unnecessary detach / deep copy in QGraphicsItem::scroll().
| * | | Doc: Fixed a typoGeir Vattekar2010-06-011-1/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-10951
| * | | Doc: QAbstractItemModel: note unexpected behavior with beginMoveRowsJohn Brooks2010-06-011-40/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The meaning of the destinationChild parameter differs when moving down in the same parent, contrary to statements by the previous docs. Reviewed-by: Olivier Goffart Merge-Request: 600
| * | | Added environment variable graphicssystem switch.Andreas Hartmetz2010-06-011-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add environment variable switch for graphicssystem so a default can be set at runtime without passing a command-line parameter. Merge-request: 622 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | Fixed a problem where QPixmaps where re-bound in non-sharing contexts.Trond Kjernåsen2010-06-012-20/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you have two non-sharing GL contexts and try to draw the same QPixmap in both of them, they will wind up competing for a spot in the texture cache. Make the context group a part of the cache key to avoid that. Task-number: QT-3462 Reviewed-by: Kim
| * | | Fix bug in QGraphicsItem::scroll() when called with no QRectF argument.Andreas Aardal Hanssen2010-06-011-13/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With a null rect argument, QGraphicsItem::scroll() is supposed to scroll the whole item. When using ItemCoordinateCache, currently the only supported mode for scroll optimization, we simple scrolled the whole cache pixmap. Problem: The cache pixmap has a border of 2 pixels. So we scroll the contents _and_ the border. This leaves white/transparent horizontal and vertical line artifacts when scrolling. This change unifies the two cases - partial and full scrolling - into one (shorter) approach that works without scrolling the margin as well. Reviewed-by: Alexis Menard <alexis.menard@nokia.com>
| * | | Make sure we don't pull inn /usr/X11 stuff in the qws mkspek confJørgen Lind2010-06-011-0/+4
| | | | | | | | | | | | | | | | Reviewed-by: paul
| * | | Avoid unnecessary detach / deep copy in QGraphicsItem::scroll().Andreas Aardal Hanssen2010-06-011-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsItem::scroll() scrolls the cache pixmap when cacheMode is enabled (for ItemCoordinateCache only). Because the pixmap exists both in the cache and in a temp QPixmap copy, the ref count is 2, so the scroll operation has to do a deep copy. To avoid this, we remove the pixmap from the cache before and reinsert it again after calling QPixmap::scroll(). Reviewed-by: Alexis Menard <alexis.menard@nokia.com>
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-0134-204/+529
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Missed file. Documentation. Optimization for sci file loading. Ensure text color set by S60 input method works for QML Items License. Avoid refilling view during model change. Test positionAt. Fix positionAt when autoScroll is use. Fix example code and image Fix doc Fix some bugs in the QML Web Browser buttons Fix zoom bug in QML Web Browser demo Fix Typo Various doc fixes and improvements Document issues with rectangle border width of 1 where clipping is used Simplify selection setting. Make TextInput more like TextEdit. Repaint all text when Ctrl+A is pressed in TextEdit
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-012-3/+19
| |\ \ \
| | * | | Documentation.Michael Brasser2010-06-011-1/+16
| | | | |
| | * | | Optimization for sci file loading.Michael Brasser2010-06-011-2/+3
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Martin Jones
| * | | | Missed file.Warwick Allison2010-06-011-0/+8
| |/ / /
| * | | Ensure text color set by S60 input method works for QML ItemsMartin Jones2010-06-011-8/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and QGraphicsWidgets. For QGraphicsWidgets use palette as per QWidget. For QML items leave the color unset so that the default pen is used. Task-number: QTBUG-10997 Reviewed-by: Sami Merila
| * | | License.Warwick Allison2010-06-011-0/+41
| | | | | | | | | | | | | | | | Pass headers test
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-0161-321/+599
| |\ \ \
| | * | | Test positionAt.Warwick Allison2010-06-011-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11127 Task-number: QTBUG-11054
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-0160-320/+555
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-0128-188/+323
| | | |\ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix example code and image Fix doc Fix some bugs in the QML Web Browser buttons Fix zoom bug in QML Web Browser demo Fix Typo Various doc fixes and improvements Document issues with rectangle border width of 1 where clipping is used Simplify selection setting. Make TextInput more like TextEdit.
| | | * | | Fix example code and imageBea Lam2010-06-011-0/+0
| | | | | |
| | | * | | Fix docYann Bodson2010-06-011-1/+1
| | | | | |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-313-226/+174
| | | |\ \ \
| | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-3125-183/+317
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Various doc fixes and improvements Document issues with rectangle border width of 1 where clipping is used Simplify selection setting. Make TextInput more like TextEdit.
| | | * | | | | Fix some bugs in the QML Web Browser buttonsAlan Alpert2010-05-312-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now with fewer warnings! Also, the stop button works.
| | | * | | | | Fix zoom bug in QML Web Browser demoAlan Alpert2010-05-312-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Zooming out no longer zooms to smaller than the window size.
| | | * | | | | Fix TypoAlan Alpert2010-05-311-1/+1
| | | | |/ / / | | | |/| | |
| | | * | | | Various doc fixes and improvementsBea Lam2010-05-3112-42/+159
| | | | | | |
| | | * | | | Document issues with rectangle border width of 1 where clipping is usedBea Lam2010-05-313-2/+33
| | | | | | |
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-318-8/+39
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to c58dc2f491a824ac56e31c440fcf7fe16dab09c4
| * | | | | | Updated WebKit to c58dc2f491a824ac56e31c440fcf7fe16dab09c4Simon Hausmann2010-05-318-8/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrate https://trac.webkit.org/changeset/60435 - [Qt] Escape backslashes in the .pro files by Ossi.
| | | * | | | Fix positionAt when autoScroll is use.Warwick Allison2010-06-011-1/+1
| | | |/ / / | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11054
| | * | | | Avoid refilling view during model change.Martin Jones2010-06-012-1/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The view position is reset to 0 after clear()ing, but this results in refill() being called, effectively undoing the clear(). Fix is to make the model invalid before resetting position. Task-number: QTBUG-11105
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-3110-139/+125
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-3131-801/+1040
| | | |\ \ \
| | | * | | | Simplify selection setting. Make TextInput more like TextEdit.Warwick Allison2010-05-3110-139/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By making selectionStart/End read-only, and adding adding select(). Task-number: QTBUG-11056