summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'mainline/4.8'Casper van Donderen2011-08-3165-985/+1888
|\ | | | | | | | | | | Conflicts: tools/qdoc3/cppcodemarker.cpp tools/qdoc3/node.cpp
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-08-3149-859/+1685
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: don't crash when destroying the shortcuts Disable activeqt on win32-g++ (it doesn't build). fix warning remove unused functions Make the DBus timeout configurable in QDBusAbstractInterface. Fix a typo in qt-conf docs. Revert "Fix build with the Clang compiler" Added missing no_include_pwd check Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)' Fix build with the Clang compiler Change spacing of title in offline style. Add support for rawFonts loaded from data in FaceId examples: fix compilation with namespaced Qt. Russian translation update Update Japanese translations for Qt 4.8. directfb: Include directfbgl.h directly tests: fix QNetworkProxyFactory test don't detach until the list is going to be modified optimize QList::removeAll()
| | * don't crash when destroying the shortcutsKonstantin Ritt2011-08-301-1/+2
| | | | | | | | | | | | | | | | | | | | | as shortcutDestroyed(..) modifies the shortcuts list. disconnect from shortcutDestroyed() first, or operate on a detach()-ed list this was uncovered by QList::removaAll() optimization patch.
| | * Merge remote-tracking branch 'upstream/4.8'Sergio Ahumada2011-08-29101-969/+1255
| | |\ | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/cppcodemarker.cpp
| | * \ Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-26105-351/+887
| | |\ \
| | * | | Disable activeqt on win32-g++ (it doesn't build).Ray Donnelly2011-08-224-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1336 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | fix warningKonstantin Ritt2011-08-221-1/+1
| | | | |
| | * | | remove unused functionsOswald Buddenhagen2011-08-222-51/+0
| | | | |
| | * | | Make the DBus timeout configurable in QDBusAbstractInterface.David Faure2011-08-198-4/+149
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1253 Reviewed-by: thiago
| | * | | Fix a typo in qt-conf docs.Casper van Donderen2011-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTWEBSITE-272 Reviewed-By: Trust Me
| | * | | Revert "Fix build with the Clang compiler"Tor Arne Vestbø2011-08-181-3/+3
| | | | | | | | | | | | | | | | | | | | This reverts commit 182b10dbad23e9da310c0d600095f17c41dd0d3c.
| | * | | Added missing no_include_pwd checkStyopa Semenukha2011-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2619 Reviewed-by: ossi
| | * | | Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'suzuki toshiya2011-08-1814-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1299 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-1863-3025/+17812
| | |\ \ \
| | * | | | Fix build with the Clang compilerTor Arne Vestbø2011-08-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://llvm.org/bugs/show_bug.cgi?id=10338 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| | * | | | Change spacing of title in offline style.Casper van Donderen2011-08-161-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Daniel Molkentin
| | * | | | Add support for rawFonts loaded from data in FaceIdPierre Rossi2011-08-153-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that with an empty filename and index of 0, all raw fonts loaded from data had the same FaceId, and we wouldn't bother to load another one after doing this once. This commit introduces a uuid in FaceId to help distinguish them in that case. Change-Id: I93655ff07a7d8856af1f854024e207c519f8ed1a Reviewed-on: http://codereview.qt.nokia.com/1882 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
| | * | | | examples: fix compilation with namespaced Qt.hjk2011-08-158-6/+12
| | | | | |
| | * | | | Russian translation updateSergey Belyashov2011-08-124-288/+687
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1303 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | | Update Japanese translations for Qt 4.8.Takumi ASAKI2011-08-124-468/+640
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1315 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | | directfb: Include directfbgl.h directlyHolger Hans Peter Freyther2011-08-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | directfb.h is included directly in all other files, include directfbgl.h without the directfb/ prefix as well. $ pkg-config --cflags directfb -D_REENTRANT -I/home/foo/install/directfb/include/directfb Merge-request: 2643 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | | tests: fix QNetworkProxyFactory testCorentin Chary2011-08-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QNetworkProxy takes an hostname, not an url. Signed-off-by: Corentin Chary <corentin.chary@gmail.com> Merge-request: 1319 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | | don't detach until the list is going to be modifiedRitt Konstantin2011-08-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removeAt() does detach()'ing for us Merge-request: 1285 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | | optimize QList::removeAll()Ritt Konstantin2011-08-124-11/+275
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a) don't detach until an occurrence found b) don't memmove every time an occurrence found c) truncate quickly ) well, numbers are better than words: before: RESULT : tst_QList::removeAll_primitive(): 2,617,902 CPU ticks per iteration (total: 261,790,171, iterations: 100) RESULT : tst_QList::removeAll_movable(): 2,547,540 CPU ticks per iteration (total: 254,753,960, iterations: 100) RESULT : tst_QList::removeAll_complex(): 16,852,099 CPU ticks per iteration (total: 1,685,209,906, iterations: 100) after: RESULT : tst_QList::removeAll_primitive(): 73,520 CPU ticks per iteration (total: 73,520,442, iterations: 1000) RESULT : tst_QList::removeAll_movable(): 90,422 CPU ticks per iteration (total: 90,422,464, iterations: 1000) RESULT : tst_QList::removeAll_complex(): 9,667,073 CPU ticks per iteration (total: 9,667,072,670, iterations: 1000) Merge-request: 1285 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-08-3011-100/+132
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: QSslCertificate: also check common name for blacklisted certificates QSslCertificate: regenerate blacklisted certificates, they were expired QSslCertificate: blacklist fraudulent *.google.com
| | * | | | | QSslCertificate: also check common name for blacklisted certificatesPeter Hartmann2011-08-301-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to reduce the possibility of blacklisting valid certificates that happen to have the same serial number as a blacklisted one, which is unlikely, but possible. Reviewed-by: Richard J. Moore <rich@kde.org>
| | * | | | | QSslCertificate: regenerate blacklisted certificates, they were expiredPeter Hartmann2011-08-309-90/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | regenerating blacklisted certificates with same serial number and common name, but longer validity: Now they are valid for 10 years.
| | * | | | | QSslCertificate: blacklist fraudulent *.google.comPeter Hartmann2011-08-302-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | blacklist the leaf certificate for now. There might well be more fake certificates in the wild, for that either the Diginotar.nl root cert needs to be disabled on the system or OCSP would need to be enabled (not supported by Qt yet). Reviewed-by: Richard J. Moore <rich@kde.org>
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵Qt Continuous Integration System2011-08-301-0/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: Doc: added since tag to QDateTime::msecsTo
| | * | | | | | Doc: added since tag to QDateTime::msecsToJoerg Bornemann2011-08-301-0/+2
| | | | | | | |
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-08-304-18/+65
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: QDeclarative::hasActiveFocus should return false for hidden items FocusScope's focusItem must always be a descendent
| | * | | | | | QDeclarative::hasActiveFocus should return false for hidden itemsAlan Alpert2011-08-302-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In graphics view you can be the focus item without being visible, but you still won't receive events. QML should hide these distinctions. Task-number: QTBUG-21045
| | * | | | | | FocusScope's focusItem must always be a descendentAlan Alpert2011-08-302-16/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20699 Reviewed-by: Michael Brasser
* | | | | | | | Merge branch '4.8'Casper van Donderen2011-08-3019-68/+380
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc
| * | | | | | | | qdoc3: Updates to qdoc to print error message in ALL CAPSMartin Smith2011-08-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when the path argument for an \example command refers to a directory that does not exist. Task-number: QTBUG-21165
| * | | | | | | | Doc: Added a note to Code Editor example docsGeir Vattekar2011-08-251-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9004 Reviewed-by: David Boddie
| * | | | | | | | Doc: QItemDelegate->QStyledItemDelegate in Star Delegate docsGeir Vattekar2011-08-251-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9440
| * | | | | | | | Doc: Added a link in Symbian Intro to Required CapabilitiesGeir Vattekar2011-08-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8942
| * | | | | | | | Doc: Added info on ordered targets for VS to qmake manualGeir Vattekar2011-08-241-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11988 Reviewed-by: David Boddie
| * | | | | | | | Doc: Small addition to the QML anchor layout docsGeir Vattekar2011-08-241-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15514 Reviewed-by: David Boddie
| * | | | | | | | Doc: Internalized QDeclarativeTypeLoaderGeir Vattekar2011-08-241-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-21029
| * | | | | | | | qdoc3: Updates for QTBUG-20776; include fileToOpen path.Martin Smith2011-08-181-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20776
| * | | | | | | | qdoc3: Updates for QTBUG-20776; clear map between runs.Martin Smith2011-08-181-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20776
| * | | | | | | | qdoc3: Updates for QTBUG-20739 (no read-only for QML components)Martin Smith2011-08-114-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20739
| * | | | | | | | qdoc3: Updates for QTBUG-20776 and QTBUG-20777Martin Smith2011-08-103-18/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20776, QTBUG-20777
| * | | | | | | | qdoc: Check pointer for null before dereferencing.Martin Smith2011-08-031-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20725
| * | | | | | | | qdoc3: Reverting part of the change for QTBUG-17072Martin Smith2011-08-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17072
| * | | | | | | | qdoc3: Write "Signal Handlers" instead of "Signals" as headerMartin Smith2011-08-023-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17072
| * | | | | | | | qdoc: Fixed to remove extranious markup tags.Martin Smith2011-07-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-numberr: QTBUG-20474
| * | | | | | | | qdoc: Added HTML.nobreadcrumbs as a config variable.Martin Smith2011-07-212-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-numberr: QTBUG-20475
generated by cgit v0.12 at 2025-01-31 03:25:49 (GMT)