summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-3060-341/+1663
|\
| * 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
| | * | 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-upstream' into 4.7-waterThierry Bastian2010-11-295-13/+55
|\ \ \ | |/ /
| * | 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
* | Fix documentation for QML extended typesCaio Marcelo de Oliveira Filho2010-11-291-2/+2
| | | | | | | | | | | | | | Fixes the documentation for QML extended types, one should use 'qmlRegisterExtendedType' instead of 'qmlRegisterType'. Reviewed-by: Leonardo Sobral Cunha <leo.cunha@nokia.com>
* | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-282-2/+3
|\ \ | |/
| * 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-upstream' into 4.7-waterThierry Bastian2010-11-2730-229/+325
|\ \ | |/
| * 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
| | | |
| | * | 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-268-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | |
| | * | Fix a race condition related to service acquisition.Thiago Macieira2010-11-263-9/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The explanation is in the testcase and in the task. The reentrancy caused some deadlocks, that's why handleMessage() stops processing if the refcount has dropped down to zero. Should also save some CPU cycles at the application shutdown time. Task-number: QTBUG-15651 Reviewed-by: Trust Me
| | * | QNetworkReply autotest: fix possible crashPeter Hartmann2010-11-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | ... by waiting for the thread to finish. Reviewed-by: Markus Goetz
| | * | QKqueueFileSystemWatcher: don't stop thread that isn't runningJoão Abecasis2010-11-262-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When removing paths from the watch list, if we end up with an empty watch list, we would send a request to the processing thread to quit. In the case where the watch list was empty to begin with (the paths being removed weren't actually being watched) the request to quit would still be queued. If the processing thread wasn't running (and it shouldn't if there weren't any paths being watched) the request to quit would still be posted but not processed. The next time paths were added and the thread started, the request would be processed and the thread would quit at once. When removing paths from the list, we now check whether the watch list is empty to begin with and exit early without asking the processing thread to quit itself. Task-Number: QTBUG-14435 Reviewed-by: Bradley T. Hughes
| | * | Fix QSettings auto test to use QTRY_VERIFYJoão Abecasis2010-11-261-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | ... instead of relying on qApp->processEvents. Reviewed-by: Olivier Goffart
| | * | tst_QFileSystemWatcher: Don't exit the event loop on first signal.Tijl Coosemans2010-11-261-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes tests can produce more than one signal and other times more than one signal would be an error. In order to test this the event loop should run long enough and not quit on the first signal. This is especially important on multicore systems where the application and worker threads run on different CPUs. Signals emitted by the worker thread are then almost immediately processed by the application thread. Merge-request: 2425 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
generated by cgit v0.12 at 2024-12-28 06:00:25 (GMT)