summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-12-01441-7440/+29137
| |\ \
| * | | Workaround for certain malformed PNGs that lack the final crc bytesaavit2010-12-011-34/+46
| | | | | | | | | | | | | | | | | | | | Task-number: QT-4103 Reviewed-by: gunnar
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-012-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix two minor doc errors
| * | | | Fix two minor doc errorsAndy Shaw2010-12-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14929, QTBUG-15739 Reviewed-by: TrustMe
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-013-7/+31
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix license header. Change pen correctly when drawing cached text Fix BorderImage painting at sizes less than margin size.
| * | | Fix license header.Jason McDonald2010-12-011-5/+5
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-012-2/+26
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Change pen correctly when drawing cached text Fix BorderImage painting at sizes less than margin size.
| * | | Change pen correctly when drawing cached textAaron Kennedy2010-12-011-0/+8
| | | | | | | | | | | | | | | | Task-number: QTBUG-14568
| * | | Fix BorderImage painting at sizes less than margin size.Martin Jones2010-12-011-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the width < left+right margins or height < top+bottom margins the image was painted with the complete margins, resulting in an ugle pattern. This change reduces the size of the margins proportionately, which gives a much better appearance. Task-number: QTBUG-15736 Reviewed-by: Yann Bodson
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-305-6/+21
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix resource leak in QEgl::getCompatibleVisualld() Fixed OpenGL state getting out of sync. Fix whitespace in previous 1e7b4e396ec3bacc1a769208b990c5e0450f0d3a Declarative: Fix compiler warnings (Linux/g++)
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-305-6/+21
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix resource leak in QEgl::getCompatibleVisualld() Fixed OpenGL state getting out of sync. Fix whitespace in previous 1e7b4e396ec3bacc1a769208b990c5e0450f0d3a Declarative: Fix compiler warnings (Linux/g++)
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Joona Petrell2010-11-3080-556/+1791
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativeengine.cpp src/declarative/qml/qdeclarativepropertycache.cpp
| * | | | Fix resource leak in QEgl::getCompatibleVisualld()Rhys Weatherley2010-11-291-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contributed patch. Task-number: QT-4335 Reviewed-by: Daniel Pope
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-266-5/+21
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed OpenGL state getting out of sync. Fix whitespace in previous 1e7b4e396ec3bacc1a769208b990c5e0450f0d3a Declarative: Fix compiler warnings (Linux/g++)
| | * | | | Fixed OpenGL state getting out of sync.Samuel Rødal2010-11-262-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forward begin / endNativePainting from the emulation paint engine. Task-number: QTBUG-15498 Reviewed-by: Gunnar Sletta
| | * | | | Fix whitespace in previous 1e7b4e396ec3bacc1a769208b990c5e0450f0d3aFriedemann Kleint2010-11-261-1/+1
| | | | | |
| | * | | | Declarative: Fix compiler warnings (Linux/g++)Friedemann Kleint2010-11-264-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-3018-30/+253
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Ensure header is considered when positioning content with snapping. Fix integer overflow in QDeclarativeItemPrivate::origin enumeration Correct ownership semantics for QObject derived types Correctly handle CppOwnership even when a QDeclarativeData doesn't exist Fix Browser.qml warnings Document which header to include for qmlRegister functions. Don't draw null pixmap in QDeclarativeImage paint function Fix id documentation Link to List Properties docs from QML Intro page
| * | | | Ensure header is considered when positioning content with snapping.Martin Jones2010-11-305-18/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When snapping is enabled the header was ignored and content would be aligned with the first item rather than the header, when at the top of the view. Task-number: QTBUG-15710 Reviewed-by: Bea Lam
| * | | | Fix integer overflow in QDeclarativeItemPrivate::origin enumerationJoona Petrell2010-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15694 Reviewed-by: Martin Jones
| * | | | Correct ownership semantics for QObject derived typesAaron Kennedy2010-11-302-2/+46
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15697
| * | | | Correctly handle CppOwnership even when a QDeclarativeData doesn't existAaron Kennedy2010-11-302-3/+47
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15695
| * | | | Fix Browser.qml warningsJoona Petrell2010-11-303-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15720 Reviewed-by: Martin Jones
| * | | | Document which header to include for qmlRegister functions.Martin Jones2010-11-303-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15630 Reviewed-by: Bea Lam
| * | | | Don't draw null pixmap in QDeclarativeImage paint functionJoona Petrell2010-11-302-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15690 Reviewed-by: Martin Jones
| * | | | Fix id documentationBea Lam2010-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15604
| * | | | Link to List Properties docs from QML Intro pageBea Lam2010-11-301-0/+4
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15606
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-3043-311/+1410
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Remove expect-fails from passing tests Add license to example code Improve consistency in handling of aliases, bindings and value types Move KeyNavigation example to snippets, plus some doc rewording
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-11-306-13/+94
| |\ \ \ \
| | * | | | Add license to example codeBea Lam2010-11-291-0/+39
| | | | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-2943-309/+1371
| | |\ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Improve consistency in handling of aliases, bindings and value types Move KeyNavigation example to snippets, plus some doc rewording
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-295-13/+55
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Removed some new warnigs. Updated language map in localize_deployment.prf Add NetworkServices capability automatically for network apps
| * | | | | | Removed some new warnigs.Alessandro Portale2010-11-291-3/+2
| | | | | | |
| * | | | | | Updated language map in localize_deployment.prfMiikka Heikkinen2010-11-292-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added missing Symbian language codes for which an Qt equivalent was available. Some codes were mapped to language/country pairs. Task-number: QTBUG-15293 Reviewed-by: Janne Koskinen
| * | | | | | Add NetworkServices capability automatically for network appsMiikka Heikkinen2010-11-292-8/+20
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Any application linking to QtNetwork, QtWebKit, or QtDeclarative is likely to utilize network, so add NetworkServices capabiltity for these applications by default in Symbian. Also increased the default epocheap maximum size for these applications. Task-number: QTBUG-14472 Reviewed-by: Janne Koskinen
| * | | | | Remove expect-fails from passing testsAaron Kennedy2010-11-301-2/+0
| |/ / / /
| * | | | Improve consistency in handling of aliases, bindings and value typesAaron Kennedy2010-11-2941-258/+1305
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13719
| * | | | Move KeyNavigation example to snippets, plus some doc rewordingBea Lam2010-11-292-51/+66
|/ / / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-282-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Autotest: fix mistake in verifying pointers Remove the FIXME, it's fixed Fix warning about uninitialised varibale.
| * | | | Autotest: fix mistake in verifying pointersThiago Macieira2010-11-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Don't assume that pointers on the heap appear always on the positive half of the addressing space.
| * | | | Remove the FIXME, it's fixedThiago Macieira2010-11-281-1/+1
| | | | |
| * | | | Fix warning about uninitialised varibale.Thiago Macieira2010-11-281-0/+1
|/ / / / | | | | | | | | | | | | | | | | This variable cannot be dereferenced when it's zero, but let's silence the compiler warning (GCC 4.4 on ARM).
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-11-274-78/+76
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Phonon: Fix use of ASCII casting in the PulseAudio support. Phonon: Fix unused parameter warning Phonon: Fix warning on casting from "false" to QFlags. Phonon: Fix "value not in enum" warning with GCC 4.5.
| * | | | Phonon: Fix use of ASCII casting in the PulseAudio support.Thiago Macieira2010-11-261-74/+72
| | | | |
| * | | | Phonon: Fix unused parameter warningThiago Macieira2010-11-261-1/+1
| | | | |
| * | | | Phonon: Fix warning on casting from "false" to QFlags.Thiago Macieira2010-11-261-2/+2
| | | | | | | | | | | | | | | | | | | | Instead, return Features();
| * | | | Phonon: Fix "value not in enum" warning with GCC 4.5.Thiago Macieira2010-11-261-1/+1
| |/ / / | | | | | | | | | | | | QMetaType::Float is not a member of QVariant::Type.
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-2723-146/+244
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (21 commits) Fix strict-aliasing violation warning. Fix warning about %x parameter type mismatch in EGL Fix warning about address of a function being constant. Fix warnings related to unused variables. Fix silly "will be initialised after" warning. Fix warning about mixing integral with non-integral type in ?: Fix warning about use of uninitialised variable Fix "value not in enum" warning with GCC 4.5. Fix warnings with GCC 4.5: some cases are not part of the enum Fix a race condition related to service acquisition. QNetworkReply autotest: fix possible crash QKqueueFileSystemWatcher: don't stop thread that isn't running Fix QSettings auto test to use QTRY_VERIFY tst_QFileSystemWatcher: Don't exit the event loop on first signal. QPollingFileSystemWatcherEngine: Fix double report of directory change. QKqueueFileSystemWatcherEngine: Use higher file descriptors. QKqueueFileSystemWatcherEngine: Unlock mutex between two events. QKqueueFileSystemWatcherEngine: Unlock mutex before calling write(2). QKqueueFileSystemWatcherEngine: Handle kevent(2) returning EINTR. QKqueueFileSystemWatcherEngine: Deleting kevent is handled by close(). ...
| * | | | Fix strict-aliasing violation warning.Thiago Macieira2010-11-261-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Strict aliasing is violated here, so just silence the compiler (GCC) by using an extension.
| * | | | Fix warning about %x parameter type mismatch in EGLThiago Macieira2010-11-261-1/+1
| | | | |
generated by cgit v0.12 at 2025-03-26 14:05:31 (GMT)