summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Revert "Split Symbian bearer plugin into three platform specfic plugins"Aaron McCarthy2010-06-037-81/+47
| | | | | | This reverts commit cd50f97a9f09eece645c9d7d01cb14c04521a915. Fails on tb9.2, reverting while working on a fix.
* Don't poll non-polling engines when configurations are in use.Aaron McCarthy2010-06-031-2/+4
|
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-06-022-0/+167
|\
| * Fix a corner case where a gesture sometimes doesn't start.Thomas Zander2010-06-022-0/+167
| | | | | | | | | | | | | | | | | | | | | | | | gestures are re-used per widget / recognizer and in the case of a gesture getting cancelled we sometimes didn't properly 'start' the gesture on new incoming events since the manager forgot to mark it as not running. Add a test case and a one line fix. Reviewed-by: Denis Task-number: QTBUG-11076
* | Doc: updating imagesMorten Engvoldsen2010-06-0217-0/+0
|/
* write PO files without duplicated message idsOswald Buddenhagen2010-06-022-7/+72
| | | | | | | | encoding the qt context as a magic comment was no particularly good idea, as it provided no disambiguation as far as gettext is concerned. so instead encode the context into msgctxt. Task-number: QTBUG-10307
* my changesOswald Buddenhagen2010-06-021-6/+33
|
* Fix failing bypassShaping autotest on the Mac OS XSimon Hausmann2010-06-021-0/+1
| | | | | | This test relies on integer metrics, so we need to force them for Mac OS X. Reviewed-by: Jocelyn Turcotte
* More Pixmap cache key optimizationsJens Bache-Wiig2010-06-029-59/+79
| | | | Reviewed-by: ogoffart
* QNAM: Improve child deletion orderMarkus Goetz2010-06-022-0/+86
| | | | | | | | Delete the QNetworkReply children first because they could access the QAbstractNetworkCache that is also a child of the QNetworkAccessManager. Reviewed-by: brad
* QSslCertificate: support large serial numbersPeter Hartmann2010-06-023-4/+46
| | | | | | | | | | We were calling an OpenSSL function that returned a long for the serial number; sometimes serial numbers are too big to fit into a long (up to 20 octets). In that case, do not convert the serial number to decimal, but just output the hexadecimal value. Reviewed-by: Zeno Albisser Task-number: QTBUG-9973
* Split Symbian bearer plugin into three platform specfic pluginsAaron McCarthy2010-06-027-47/+81
| | | | | | | | Symbian bearer plugin has more functionality when built for newer platforms, so split the plugin into three platform specific plugins, and deploy the correct one depending on what the device supports. Written by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Doc: adding offline docs to assistant and Qt Creator. Improving small docs ↵Morten Engvoldsen2010-06-0218-57/+1570
| | | | and adding highlighting
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-0234-2111/+8835
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Some optimizations for QImage::load() fix setRawData() Fix QML crashes on the N900 doc: Added DITA XML generator Fix build failure on Symbian 3.1. Add the Qt::TextBypassShaping flag. QTextEngine: skip an unnecessary call to GetDeviceCaps on Windows. Add my 4.7.0 changes qdoc: Added DITA XML generator doc: Fixed confusing ownership issue. update Russian translations for Qt tools update Russian translation for Qt libraries QXmlSchema documentation correction doc: Changed last breadcrumb to not be a link. doc: Fixed reference to setSize(), which is in QRectF. QNetworkCookie: do not accept cookies with non-alNum domain QtDeclarative: Remove trailing commas in enums Doc: MonotonicClock is obviously monotonic
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-0134-2111/+8835
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Some optimizations for QImage::load() fix setRawData() Fix QML crashes on the N900 doc: Added DITA XML generator Fix build failure on Symbian 3.1. Add the Qt::TextBypassShaping flag. QTextEngine: skip an unnecessary call to GetDeviceCaps on Windows. Add my 4.7.0 changes qdoc: Added DITA XML generator doc: Fixed confusing ownership issue. update Russian translations for Qt tools update Russian translation for Qt libraries QXmlSchema documentation correction doc: Changed last breadcrumb to not be a link. doc: Fixed reference to setSize(), which is in QRectF. QNetworkCookie: do not accept cookies with non-alNum domain QtDeclarative: Remove trailing commas in enums Doc: MonotonicClock is obviously monotonic
| | * Some optimizations for QImage::load()Jens Bache-Wiig2010-06-011-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We didnt check if the file existed before trying to load it. This means that we had a lot of redundant dlopen calls for that case. In addition pixmap cache should be significantly faster now. Task-number: QTBUG-11137 Reviewed-by: joao
| | * fix setRawData()Oswald Buddenhagen2010-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setRawData() itself (consistently with fromRawData()) sets alloc to the passed raw size, so the check at the start would always find that we cannot re-use the qstring object, thus completely defeating the purpose of the function. so also check that the string data pointer actually points into the internal array before giving up. Reviewed-by: olivier
| | * Fix QML crashes on the N900Simon Hausmann2010-06-011-0/+8
| | | | | | | | | | | | | | | | | | | | | JavaScriptCore and QtWebKit JIT symbols were clashing. Hide the new thunk functions that DEFINE_STUB_FUNCTION declares. Reviewed-by: Tapani Mikola <tapani.mikola@nokia.com>
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-0131-2108/+8817
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: doc: Added DITA XML generator Fix build failure on Symbian 3.1. Add the Qt::TextBypassShaping flag. QTextEngine: skip an unnecessary call to GetDeviceCaps on Windows. Add my 4.7.0 changes qdoc: Added DITA XML generator doc: Fixed confusing ownership issue. update Russian translations for Qt tools update Russian translation for Qt libraries QXmlSchema documentation correction doc: Changed last breadcrumb to not be a link. doc: Fixed reference to setSize(), which is in QRectF. QNetworkCookie: do not accept cookies with non-alNum domain QtDeclarative: Remove trailing commas in enums Doc: MonotonicClock is obviously monotonic
| | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-0149-49/+259
| | | |\
| | | | * Fix build failure on Symbian 3.1.Aaron McCarthy2010-06-011-2/+2
| | | | |
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-0128-2106/+3684
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add the Qt::TextBypassShaping flag. QTextEngine: skip an unnecessary call to GetDeviceCaps on Windows. Add my 4.7.0 changes qdoc: Added DITA XML generator doc: Fixed confusing ownership issue. update Russian translations for Qt tools update Russian translation for Qt libraries QXmlSchema documentation correction doc: Changed last breadcrumb to not be a link. doc: Fixed reference to setSize(), which is in QRectF. QNetworkCookie: do not accept cookies with non-alNum domain QtDeclarative: Remove trailing commas in enums Doc: MonotonicClock is obviously monotonic
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-3128-2106/+3684
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add the Qt::TextBypassShaping flag. QTextEngine: skip an unnecessary call to GetDeviceCaps on Windows. Add my 4.7.0 changes qdoc: Added DITA XML generator doc: Fixed confusing ownership issue. update Russian translations for Qt tools update Russian translation for Qt libraries QXmlSchema documentation correction doc: Changed last breadcrumb to not be a link. doc: Fixed reference to setSize(), which is in QRectF. QNetworkCookie: do not accept cookies with non-alNum domain QtDeclarative: Remove trailing commas in enums Doc: MonotonicClock is obviously monotonic
| | | | | | * Add the Qt::TextBypassShaping flag.Jocelyn Turcotte2010-05-317-1/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows quick layouting especially with Windows fonts which contain heavy OpenType logic. On regular latin text the visual compromize is the loss of kerning, justification, capitalization, word spacing and letter spacing support. Reviewed-by: Simon Hausmann Reviewed-by: Eskil
| | | | | | * QTextEngine: skip an unnecessary call to GetDeviceCaps on Windows.Jocelyn Turcotte2010-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Simon Hausmann
| | | | | | * Add my 4.7.0 changesLeonardo Sobral Cunha2010-05-311-0/+6
| | | | | | |
| | | * | | | doc: Added DITA XML generatorMartin Smith2010-06-012-0/+5131
| | | | |_|/ | | | |/| |
| | | * | | qdoc: Added DITA XML generatorMartin Smith2010-05-313-3/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the moment, it is just like the HTML generator, but with a different class name.
| | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-318-2058/+3458
| | | |\ \ \
| | | | * | | update Russian translations for Qt toolsRitt Konstantin2010-05-315-525/+508
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 621 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | | * | | update Russian translation for Qt librariesRitt Konstantin2010-05-312-1529/+2949
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this contains some changes from symbian-commissioned "professional" translations Merge-request: 621 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | | * | | QXmlSchema documentation correctionPeter Hartmann2010-05-311-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use a QByteArray to load the schema, not a QIODevice. Reviewed-by: David Boddie
| | | * | | | doc: Fixed confusing ownership issue.Martin Smith2010-05-311-4/+4
| | | |/ / / | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10934
| | | * | | doc: Changed last breadcrumb to not be a link.Martin Smith2010-05-311-33/+16
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10577
| | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-31170-2745/+5863
| | | |\ \ \
| | | | * | | QNetworkCookie: do not accept cookies with non-alNum domainPeter Hartmann2010-05-312-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do not accept a cookie whose domain attribute cannot be converted to an ACE domain. Reviewed-by: Thiago Macieira Task-number: QTBUG-11029
| | | | * | | QtDeclarative: Remove trailing commas in enumsThiago Macieira2010-05-313-3/+3
| | | | | | |
| | | | * | | Doc: MonotonicClock is obviously monotonicThiago Macieira2010-05-311-1/+1
| | | | | | |
| | | * | | | doc: Fixed reference to setSize(), which is in QRectF.Martin Smith2010-05-311-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10903
* | | | | | | 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
generated by cgit v0.12 at 2024-11-08 01:36:35 (GMT)