summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into ↵Qt Continuous Integration System2011-08-29476-4848/+10387
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: Do not unconditionally use pkg-config in .pro files Updated WebKit to dda59e50379214c098f365a39c4d64b39ced427e Updated WebKit to 85d4df147ac7b239497b05979a51fd6fde7580fd Updated WebKit to 836fa24be73978fb292e954abb151fb46b1d97e0 Updated WebKit to 4277f8277b1daf3ec33c996f5a760ccd1113af4b Updated WebKit to 8ed79cb10ca72b5d240beae674a7932963cbd007 Updated WebKit to 66b76cdb8ef823f27a8229c5cae2d35e7f2d3c59
| * \ \ \ \ \ \ Merge remote-tracking branch 'review/master'Sergio Ahumada2011-08-29476-4848/+10387
| |\ \ \ \ \ \ \ |/ / / / / / / /
| * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-teamQt Continuous Integration System2011-08-271115-43996/+68466
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team: (246 commits) Do not unconditionally use pkg-config in .pro files Updated WebKit to dda59e50379214c098f365a39c4d64b39ced427e Updated WebKit to 85d4df147ac7b239497b05979a51fd6fde7580fd Updated WebKit to 836fa24be73978fb292e954abb151fb46b1d97e0 Updated WebKit to 4277f8277b1daf3ec33c996f5a760ccd1113af4b Updated WebKit to 8ed79cb10ca72b5d240beae674a7932963cbd007 Updated WebKit to 66b76cdb8ef823f27a8229c5cae2d35e7f2d3c59 uikit: update SDK setting for the simulator Add option to compare to different platform in lancelot autotest uikit: Use release Qt for simulator, update README Automatic closing of input panel on uikit when QML item looses focus. Fixed compile error in qwindowsurface_qws.cpp. Fixed regression introduced by 5842d19cf3dff37a85c. Remove DerivedSources.pro from WebKit. Support debuggable in the makefile build system QLabel documentation: add warning about sanitizing input runonphone: fix failure to terminate Fix license headers in new files from coda patch runonphone: command line args improperly passed to TRK after CODA patch Mark all Symbian debug binaries debuggable by default ...
| | * | | | | | | Do not unconditionally use pkg-config in .pro filesRohan McGovern2011-08-264-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the first pkg-config in PATH is prone to errors when cross compiling. This is a known issue, and `configure' already avoids using pkg-config for cross compiling (unless -force-pkg-config is used). However, there was previously no way for a .pro file to test whether or not the user had passed -force-pkg-config. Let !contains(QT_CONFIG, no-pkg-config) be used to test whether or not it is safe to run pkg-config.
| | * | | | | | | Updated WebKit to dda59e50379214c098f365a39c4d64b39ced427eAdemar de Souza Reis Jr2011-08-268-78/+69
| | | | | | | | |
| | * | | | | | | Updated WebKit to 85d4df147ac7b239497b05979a51fd6fde7580fdAdemar de Souza Reis Jr2011-08-258-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This time also including WebKitLibraries/*.a, needed for the Mac build.
| | * | | | | | | Updated WebKit to 836fa24be73978fb292e954abb151fb46b1d97e0Ademar de Souza Reis Jr2011-08-2547-71/+1312
| | | | | | | | |
| | * | | | | | | Updated WebKit to 4277f8277b1daf3ec33c996f5a760ccd1113af4bAdemar de Souza Reis Jr2011-08-18301-22/+392
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This time including webkit/include/ files generated on a Mac (thanks to Alexis Menard).
| | * | | | | | | Updated WebKit to 8ed79cb10ca72b5d240beae674a7932963cbd007Ademar de Souza Reis Jr2011-08-114-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
| | * | | | | | | Updated WebKit to 66b76cdb8ef823f27a8229c5cae2d35e7f2d3c59Ademar de Souza Reis Jr2011-08-11139-4752/+8663
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
| * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-teamQt Continuous Integration System2011-07-0262-274/+532
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team: (31 commits) changelog Compile with DEBUG_FONTENGINE define minor optimization remove the old compatibility code make QFontEngineQPF1 work even without mmap(2) support Re-apply licenseheader text in source files for qt4.7 Make sure the declarative plugin of QtWebKit is build once. Doc: Fixing typo Update 4.8.0 changes file Symbian socket engine: remove remaining todo comments Symbian: tune network autotest heap size so they can run on emulator Cocoa: QFileDialog: fix filename filter not applied correctly Fix typo in docs: occurred. Cocoa: fix qtabwidget auto test failure Cocoa: fix qwidget auto test failures Fix QWidget::palettePropagation2() autotest on Symbian (part 2) Cocoa: Fix qgraphicsproxywidget auto test Fix QWidget::palettePropagation2() autotest on Symbian QTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5 Fix text color in some cases of QML and QStaticText ...
* | \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-08-292-4/+77
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: Fix conversion of QAbstractItemModel::rowsMoved() parameters
| * | | | | | | | Fix conversion of QAbstractItemModel::rowsMoved() parametersBea Lam2011-08-292-4/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VisualDataModel was emitting itemsMoved() signal with incorrect "to" value when multiple items were moved forwards. Reviewed-by: Martin Jones
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-08-2816-23/+158
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Default graphics memory quota for Symbian applications Fix warning about missing qs60keycapture_p.h header in gui Reimplement MR1271 over coda patch Fixed Symbian memory leak in utcToLocal(QDate &, QTime &) Fix bad merge on a couple of xml examples DEF file freeze
| * \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-08-23218-3951/+19270
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (103 commits) Fix non-ascii name issues in ICD. Compile fix for Symbian 5th and earlier Improve documentation for QDeclarativeView::setSource() fix copying webkit guide under windows Symbian: Fix backspace on empty lines of multiline textedits Handle CloseSoftwareInputPanel event in QCoeFepInputContext uikit: Fixes for Open GL ES 1 and for pre-3GS devices uikit: Fix warning. Use thumb instructions for uikit Fix compilation with thumb2. Update uikit README: svg works, warn about thumb Fix delayed password masking mid-string. Disabled splitscreen translation still moves screen Fix bidi reordering of RTL text with embedded images Doc: Fixed qdoc warnings. don't crash when destroying codec list Fixed infinite loop when loading certain SVGs. Fix a crash in a11y introduced by d289e54f2d2aa066cb3 Doc: Fixed qdoc warnings. test: Fix `tst_qfiledialog' in a namespaced build ...
| | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-08-23218-3951/+19270
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-08-183-0/+33
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Default graphics memory quota for Symbian applications
| | * | | | | | | | | | Default graphics memory quota for Symbian applicationsMiikka Heikkinen2011-08-183-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The graphics memory quota, which is a new feature in S60 5.4, now gets default value of 24MB. User can override the default value using RSS_RULES: RSS_RULES += "graphics_memory=<# of kB>;" Task-number: QT-4963 Reviewed-by: Sami Merila
generated by cgit v0.12 at 2025-09-11 00:40:00 (GMT)