summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* don't use qWarning() - or even qFatal()! - gratuitously.Oswald Buddenhagen2010-06-0311-186/+178
| | | | Task-number: QTBUG-8044
* 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
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Andy Shaw2010-06-0368-969/+1221
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-0386-2246/+10893
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (30 commits) Revert "Split Symbian bearer plugin into three platform specfic plugins" Don't poll non-polling engines when configurations are in use. Doc: updating images Fix a corner case where a gesture sometimes doesn't start. write PO files without duplicated message ids my changes Fix failing bypassShaping autotest on the Mac OS X More Pixmap cache key optimizations QNAM: Improve child deletion order QSslCertificate: support large serial numbers Split Symbian bearer plugin into three platform specfic plugins Doc: adding offline docs to assistant and Qt Creator. Improving small docs and adding highlighting 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 ...
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-035-30/+46
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Avoid mmap() on symbian os Fix Qt.sis content for Symbian^3 builds
| | * | Avoid mmap() on symbian osShane Kearns2010-06-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QResource and QTranslator use mmap() on unix as an optimisation. Symbian OS doesn't support memory mapped files, so mmap() is actually worse than opening and reading the file yourself. So, switched off mmap() usage on symbian. Reviewed-by: mread
| | * | Fix Qt.sis content for Symbian^3 buildsMiikka Heikkinen2010-06-023-28/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some build-time omissions from Qt_template.pkg are done, so qt.sis built on Symbian^3 will not work properly on most S60 3.x & 5.0 devices. This should not be an issue, as Symbian^3 builds are expected to be configured to use OpenVG anyway. If necessary, it is still possible to build Qt.sis compatible with older platforms also on Symbian^3 if you fake the S60 version when calling qmake, e.g.: 'qmake S60_VERSION=5.0' Reviewed-by: Shane Kearns
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-0364-939/+1175
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Add Q_AUTOTEST_EXPORT Ensure PathView mappedRange is updated when pathItemCount changes. Doc Fix basic types docs indentation Improve basic types documentation. Don't imply that Item has Remove Media elements from Elements index Add some Q_AUTOTEST_EXPORTs Keep ListView highlight in sync when currentItem changes geometry. QDeclarativeImage::updatePaintedGeometry() does not need to be a slot QML viewer now supports TopUp, TopDown, RightUp and LeftUp orientations Text should update when the alignment changes. Add qml import plugins to qt.iby and qt.sis Take into account platform differences in input panel support More autoScroll fixes Doc fixes and improvements - fix some example code, link to Add Vector3dAnimation to list of QML elements
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-06-031-0/+1
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-039-250/+259
| | | |\ \ \
| | | * | | | Ensure PathView mappedRange is updated when pathItemCount changes.Martin Jones2010-06-031-0/+1
| | | | | | |
| | * | | | | Add Q_AUTOTEST_EXPORTAaron Kennedy2010-06-031-1/+1
| | | |/ / / | | |/| | |
| | * | | | DocAaron Kennedy2010-06-031-1/+1
| | | | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-06-033-240/+253
| | |\ \ \ \
| | | * | | | Fix basic types docs indentationBea Lam2010-06-031-242/+242
| | | | | | |
| | | * | | | Improve basic types documentation. Don't imply that Item hasBea Lam2010-06-031-30/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | properties like "geometry" and "position". Task-number: QTBUG-11169
| | | * | | | Remove Media elements from Elements indexBea Lam2010-06-031-8/+3
| | | |/ / /
| | | * | | Keep ListView highlight in sync when currentItem changes geometry.Martin Jones2010-06-031-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11110
| | * | | | Add some Q_AUTOTEST_EXPORTsAaron Kennedy2010-06-037-10/+10
| | |/ / /
| | * | | QDeclarativeImage::updatePaintedGeometry() does not need to be a slotMartin Jones2010-06-031-2/+0
| | | | |
| | * | | QML viewer now supports TopUp, TopDown, RightUp and LeftUp orientationsBea Lam2010-06-027-56/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of Portrait/Landscape. The new orientations are named the same as the orientations in the QtMobility sensors module. Task-number: QTBUG-11106 Reviewed-by: akennedy
| | * | | Text should update when the alignment changes.Michael Brasser2010-06-021-0/+2
| | | | |
| | * | | Add qml import plugins to qt.iby and qt.sisJoona Petrell2010-06-022-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10835, QTBUG-9784 Reviewed-by: Alessandro Portale Import plugins provide functionality (webkit, gesture, folderlistmodel, particle elements) that is important for QML application development and should be included in Qt 4.7 deployment. Even the plugins labeled as "Qt Labs" plugins will be maintained in the future Qt 4.x releases.
| | * | | Take into account platform differences in input panel supportJoona Petrell2010-06-029-141/+285
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Warwick Allison
| | * | | More autoScroll fixesWarwick Allison2010-06-022-2/+18
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11143
| | * | | Doc fixes and improvements - fix some example code, link toBea Lam2010-06-0235-486/+488
| | | | | | | | | | | | | | | | | | | | examples from class docs and improve assorted docs
| | * | | Add Vector3dAnimation to list of QML elementsBea Lam2010-06-021-0/+1
| |/ / /
* | | | 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
generated by cgit v0.12 at 2025-01-03 21:55:47 (GMT)