summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Mention that image providers should be added before loading QML filesBea Lam2010-12-031-0/+3
|
* Append qml import path individually for each available drive on SymbianJoona Petrell2010-12-022-2/+33
| | | | | Task-number: QTBUG-15405 Reviewed-by: Jason Barron
* Update TextInput when echoMode changes.Yann Bodson2010-12-021-1/+1
| | | | | Task-number: QTBUG-15779 Reviewed-by: Martin Jones
* Ensure semi-transparent rects paint correctly with radius == size/2.Martin Jones2010-12-021-0/+6
| | | | | | | | The margins could overlap, which caused overpainting. Ensure the margins are always <= width or height /2. Task-number: QTBUG-14657 Reviewed-by: Yann Bodson
* Rectangle should not paint with negative width or heightChristopher Ham2010-12-021-0/+2
| | | | | Task-number: QTBUG-15250 Reviewed-by: Martin Jones
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-012-12/+26
|\ | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: ListView header is not visible initially.
| * ListView header is not visible initially.Martin Jones2010-12-012-12/+26
| | | | | | | | | | | | | | | | | | If the header size was not set explicitly, but determined implicitly from Text height, the view was not positioned so that the header was visible when first shown. Task-number: QTBUG-15599 Reviewed-by: Bea Lam
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-011-34/+47
|\ \ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Improvement of de30288: handle PNGs having 1 to 4 bytes truncated. Workaround for certain malformed PNGs that lack the final crc bytes
| * | Improvement of de30288: handle PNGs having 1 to 4 bytes truncated.aavit2010-12-011-1/+2
| | | | | | | | | | | | | | | Task-number: QT-4103 Reviewed-by: trustme
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-12-01141-1044/+2288
| |\ \
| * | | 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-011-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | 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-011-1/+1
| | |/ | |/| | | | | | | | | | 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-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/qt into 4.7Joona Petrell2010-11-3044-523/+867
| |\ \ | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Ensure header is considered when positioning content with snapping.Martin Jones2010-11-302-17/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-301-2/+9
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15697
* | | | | Correctly handle CppOwnership even when a QDeclarativeData doesn't existAaron Kennedy2010-11-301-3/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15695
* | | | | Fix Browser.qml warningsJoona Petrell2010-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15720 Reviewed-by: Martin Jones
* | | | | Don't draw null pixmap in QDeclarativeImage paint functionJoona Petrell2010-11-301-1/+1
| |_|/ / |/| | | | | | | | | | | | | | | Task-number: QTBUG-15690 Reviewed-by: Martin Jones
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-2918-307/+620
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * '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
| * | | | Improve consistency in handling of aliases, bindings and value typesAaron Kennedy2010-11-2917-256/+599
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13719
| * | | | Move KeyNavigation example to snippets, plus some doc rewordingBea Lam2010-11-291-51/+21
| | | | |
* | | | | Removed some new warnigs.Alessandro Portale2010-11-291-3/+2
|/ / / /
* | | | 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-2718-130/+165
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | |
| * | | | Fix warning about address of a function being constant.Thiago Macieira2010-11-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In OpenGL ES 2, these functions are always expected to be present, so the address can never be zero. So only test for the function being found if we tried to find it dynamicaly.
| * | | | Fix warnings related to unused variables.Thiago Macieira2010-11-267-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just add some Q_UNUSED for parameters or remove the variable we don't need for the others. Reviewed-by: Trust Me
| * | | | Fix silly "will be initialised after" warning.Thiago Macieira2010-11-261-1/+1
| | | | |
| * | | | Fix warning about mixing integral with non-integral type in ?:Thiago Macieira2010-11-261-2/+2
| | | | |
| * | | | Fix warning about use of uninitialised variableThiago Macieira2010-11-261-1/+1
| | | | |
| * | | | 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.
| * | | | Fix warnings with GCC 4.5: some cases are not part of the enumThiago Macieira2010-11-261-2/+2
| | | | |