summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Autotest: make at least one update before checking if more are neededThiago Macieira2011-02-201-4/+8
| | | | | | The timer gets started only by making updates. If you try to check if an update is needed without making the first update, the timer won't be started and the function will return false.
* Fix warning about id maybe used when uninitialisedThiago Macieira2011-02-201-1/+1
| | | | | The code would indicate it's never used uninitialised, but gcc doesn't know it.
* Doc: setSslConfiguration also sets the CA certificatesThiago Macieira2011-02-201-2/+3
|
* Autotest: check that the type received is the expected oneThiago Macieira2011-02-201-8/+43
| | | | Task-number: QTBUG-17476
* Attempt to fix symbian 3.1 and 3.2 compile break.Jason McDonald2011-02-181-3/+7
| | | | | | | | | | | | | | e46c44f9538dbe5b44ce61d3a42403cfa471ae8b restructured qml.pri. In the original version the else part at the bottom of the file was processed for Symbian 3.1 and 3.2, but the commit stopped that from happening. This commit makes the minimal change to make the statements in the else part apply to 3.1 and 3.2 again. Really the file should be restructured to have separate logic for setting each vairable, but I'll leave that task for the developers. Reviewed-by: Eckhart Koppen
* Prevents crashing when ICO file has bad color table valueMauri Vehniäinen2011-02-181-0/+2
| | | | | | | | | | | When color table value is read from ICO header memory allocation is made based on this value. This case is relevant only when reading 8bit images. Therefore values over 256 will abort reading the image. Task-number: QT-4535 Merge-request: 1090 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* directfb: fix crash in client/server mode of qwsDenis Oliver Kropp2011-02-172-16/+31
| | | | | | | | | | | | | | The server was crashing due to client pointer being sent as "sibling". Instead surface flags are sent and sibling code is removed. Also the window ID is transfered and used on receiver side to get a local handle to the window. Click to focus window works, but it is not raised. Merge-request: 989 Reviewed-by: Marcel Schuette <marcel.schuette@nokia.com>
* Make Qt/DirectFB less verbose about failing to load pixmaps.Anders Bakken2011-02-171-3/+2
| | | | | | | | | | Qt/DirectFB is way too verbose about not being able to use DirectFB for loading images. A lot of times DirectFB doesn't have support for e.g. pngs or gifs and currently one gets a message for every failed pixmap load, even if they will succeed when falling back to Qt. Merge-request: 2552 Reviewed-by: Marcel Schuette <marcel.schuette@nokia.com>
* Autotest: don't use the deprecated signal from QDBusConnectionInterfaceThiago Macieira2011-02-171-39/+17
|
* Autotest: be nicer to the subprocess and SIGTERM itThiago Macieira2011-02-171-1/+2
|
* Fix warnings in QtDeclarativeThiago Macieira2011-02-173-3/+3
|
* Autotest: avoid memory leaks if test failsThiago Macieira2011-02-171-24/+41
|
* QtDBus: Make sure we can receive unknown typesThiago Macieira2011-02-173-3/+114
| | | | | | | We must make sure we advance the receiving iterator, or we end up in an infinite loop. Task-number: QTBUG-17476
* QtDBus meta object: keep methods, signals and props with unknown typesThiago Macieira2011-02-173-10/+23
| | | | | | | | | | | | | | | | | | | | | Use VoidStar as the metatype, with an unknown type called "QDBusRawType". The actual D-Bus type is saved as an hex value as a template parameter. D-Bus type Qt type comment h QDBusRawType<0x68>* Unix file descriptors ~ QDBusRawType<0x7e>* invalid type ai QDBusRawType<0x6169>* array of int32 a{i(ssy)} QDBusRawType<0x617b6928737379297d>* Note that the number in the template doesn't have to be valid. The QDBusRawType class doesn't exist anyway. I thought of just leaving the raw D-Bus type there, but who knows what kind of things can appear there, like other '>' (which may cause problems for anything trying to parse the meta object later). Task-number: QTBUG-17476
* Autotest: add a new test for parsing an introspection with unknown typesThiago Macieira2011-02-171-2/+33
| | | | Task-number: QTBUG-17476
* Make the QtDBus parser not complain about unknown thingsThiago Macieira2011-02-173-36/+43
| | | | | | | Keep only the warnings about application errors. If the unknown things come from the outside, it's not our job to make noise. Task-number: QTBUG-17476
* fix-layer-getsurface-result-check-for-screen-size-determinationDenis Oliver Kropp2011-02-171-1/+1
| | | | | | | GetSurface() was checked for NOT returning DFB_OK, but it should Merge-request: 2528 Reviewed-by: Marcel Schuette <marcel.schuette@nokia.com>
* Bump QtWebKit version to 2.0.2Ademar de Souza Reis Jr2011-02-171-2/+2
| | | | | | | | | QtWebKit 2.0.1 was part of Qt-4.7.1, QtWebKit as included in 4.7.2 should be 2.0.2. Merge-request: 1095 Task-number: QTBUG-17480 Reviewed-by: Jason McDonald
* SSL: fix memory leak when loading certificates on Mac OS XMartin Petersson2011-02-161-0/+1
| | | | Reviewed-by: Markus Goetz
* Add a mutex to protect the access to the QSet.Thiago Macieira2011-02-161-1/+4
| | | | | | | | | | | | In theory, there should be no problems with doing this unlocked, as the test should only run one thread at a time in this particular code section. In practice, if the test is failing, multiple threads would be modifying the QSet. So the mutex is necessary to detect the test failing. Reviewed-By: Morten Sørvig
* Use QElapsedTimer in QFutureInterface.Thiago Macieira2011-02-162-7/+7
| | | | | | | | QElapsedTimer can also keep its on vlaid/invalid state, so we don't need to keep an additional boolean. Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=227660 Reviewed-by: Morten Sørvig
* Keep sending posted events after commit 7196045b78b33cf135683d5c0b4e164f95231791Bradley T. Hughes2011-02-141-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | This commit put in place a timer based mechanism to ensure that posted events continue to be sent. As pointed out in commit eb1015c7bbf135af3656110a4d112377c1209db8, GetQueueStatus() can indicate that there are messages in the queue but our hook never actually receives them, hence the timer solution. However, having the message type and hwnd "guards" in the conditional for starting a timer would cause us to lose events in some situations, due to the fact that QEventDispatcherWin32::processEvents() will only allow one WM_QT_SENDPOSTEDEVENTS message per call (multiple messages will be compressed into a single one). When racing with other threads, it would be possible to end up blocking one thread that has pending posted events unintentionally. This fix removes the guards and makes sure that we start the keep alive timer when it's really needed, and only stops it when we really know that there is nothing left in the Windows message queue. Task-number: QTBUG-17014 Reviewed-by: joao Reviewed-by: Marius Storm-Olsen
* Designer: Slots of main container not visible in signal/slot editor.Friedemann Kleint2011-02-112-3/+12
| | | | | | | | Fix a regression introduced by dd7873cd7e02e42b384709f33a34f69bc06fb25d of QTBUG-17179. Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Task-number: QTBUG-17358
* Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-02-10710-18374/+35733
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-101-33/+19
| |\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix QFileDialog Symbian native file dialog filename filtering.
| | * Fix QFileDialog Symbian native file dialog filename filtering.Miikka Heikkinen2011-02-101-33/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | Now QFileDialog static functions that use Symbian native file dialog should find the same files as non-native QFileDialog for any given filename filter. Task-number: QTBUG-17298 Reviewed-by: Janne Koskinen
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-101-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix QMAKE_COPY_DIR for mingw+sh
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-1026-16/+6986
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: PathView items were not correctly updated when rootIndex changed. Allow text to selected in a TextEdit or TextInput inside a Flickable.
| | * | | PathView items were not correctly updated when rootIndex changed.Martin Jones2011-02-103-16/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PathView got confused because it queried the model when removing items due to the rootIndex change. This caused new items to be added since the model->count() was not zero (it was the count for the new rootIndex). Calculate the PathView modelCount similarly to the other views (rather than querying the model) and correctly handle the modelCount being set to zero. Change-Id: I9e4fb27c14aa8c77ad37ff01d95c123f909db20d Task-number: QTBUG-16366 Reviewed-by: Bea Lam
| | * | | Allow text to selected in a TextEdit or TextInput inside a Flickable.Andrew den Exter2011-02-1023-0/+6891
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set keepMouseGrabs to true when the selectByMouse property is enabled to prevent flickable from stealing the mouse grab and interrupting a selection. Change-Id: I08e11265ab9c55d239fd09aceef4fdb8e74aba9d Task-number: QTBUG-16956 Reviewed-by: Martin Jones
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-109-76/+248
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update modules-related tests and docs CLeanup registers after AddString
| | * | | Update modules-related tests and docsBea Lam2011-02-108-73/+210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tests for remote imports and fixed/improved examples and text in the docs. Change-Id: I8f411a0287c4d50ec3cebe5567d803689cd5b1c7
| | * | | CLeanup registers after AddStringAaron Kennedy2011-02-101-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Martin Jones Change-Id: I7bd2806770fe5b86fbc589644107d74981d32abe
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-101-0/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Stop focus propagation of touch events when flag is set.
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-0910-45/+149
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: 4.7.2 changes Change paging attributes for Symbian binaries Fix build failure Fix regression in creating mkspecs/default Changes for 4.7.2 Recreate Symbian raster backing store when WA_TranslucentBackground set
| | * | | | 4.7.2 changesIain2011-02-091-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | | Change paging attributes for Symbian binariesIain2011-02-093-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed UNPAGED workaround from QtCore and QtSql on OS releases where data paging is supported. Depends on new macro being defined in the OS builds (SYMBIAN_DLL_DATA_EXPORTS_SUPPORTED) to allow us to detect this. Data exports are supported in all S^3 builds after early 2009, however, this macro is only added recently (and thus isn't defined in, eg. Symbian Foundation PDKs (v3.0.4), or current releases (v0.9) of the S^3 SDK from Nokia). Thus building Qt against these older S^3 builds will still result in QtCore and QtSql being unpaged. Also, remove PAGED keyword from all Qt-based software. This changes the code paging field in the Symbian (E32Image) header from "paged" to "default". Thus it is left to the configuration of the particular device whether paging is used for the binary or not. All devices that support code paging should have it turned on (the value is stored in the HAL, so can be checked using eg. fshell); data paging may or may not be turned on depending on the device characteristics. Leaving both code and data paging as "default" means that any limitations in the device (eg. around flash wear) can be controlled by that device by disabling the appropriate types of paging. This change also leaves the way open to deprecated PAGED as a keyword in the Symbian build systems, so you can only opt out of paging. This makes more sense, as the default for code paging will be on, the default for data paging will be on if the device can handle it, and binaries should only be opting out of paging if they have some specific real-time requirements that paging inhibits. Task-number: QT-3503 Task-number: QTBUG-13931 Reviewed-by: Shane Kearns
| | * | | | Fix build failureGareth Stockwell2011-02-092-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17288 Reviewed-by: trustme
| | * | | | Fix regression in creating mkspecs/defaultMiikka Heikkinen2011-02-093-29/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy all files from original mkspec to default one and modify *.conf, *.prf, and *.h to include their original counterparts. Task-number: QTBUG-17258 Reviewed-by: Oswald Buddenhagen
| | * | | | Changes for 4.7.2Gareth Stockwell2011-02-091-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Jani Hautakangas
| | * | | | Recreate Symbian raster backing store when WA_TranslucentBackground setGareth Stockwell2011-02-093-4/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17288 Reviewed-by: Jani Hautakangas
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-02-091-0/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed tst_qpixmap::toImageDeepCopy autotest for GL graphicssystem.
| | * | | | | Fixed tst_qpixmap::toImageDeepCopy autotest for GL graphicssystem.Samuel Rødal2011-02-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to copy the image if painting is active. Reviewed-by: Jani Hautakangas
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-0925-190/+637
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix auto test failure. PathView regression: dragging the path didn't update currentIndex Fix docs for variant and list basic types Add test for importing plugins that contain QML files Call onAdd() for first items added to ListView and GridView Use same values for Text.lineHeightMode and QTextBlock::lineHeightMode from master. Don't clear pre-edit text when a graphics items loses focus.
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2011-02-0930-51/+642
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativemoduleplugin/qdeclarativemoduleplugin.pro Change-Id: I8da521f05ebc266d91caa582852155b571d5cc63
| | | * | | | | Fix auto test failure.Andrew den Exter2011-02-091-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow the input context to be reset twice. The context is reset because of two events, the first is because an item lost focus and that reset needs to occur before the focus moves away from the item or events won't be delivered to it. The second redundant reset is because the Qt::WA_InputMethodEnabled flag was cleared on the view widget because no item has focus and it has no way to know the context doesn't need to be reset. Change-Id: Ie3b3fc6898d144ed3f8b3822e49ea0eee7e029f4 Reviewed-by: Martin Jones
| | | * | | | | PathView regression: dragging the path didn't update currentIndexMartin Jones2011-02-093-1/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some refectoring while fixing QTBUG-13687 resulted in the private setOffset() method being called rather than the public. The public version was responsible for updating currentIndex. Change-Id: Iac9c7a19d6fa64550b9498e77b8983512e199370 Task-number: QTBUG-17319 Reviewed-by: Michael Brasser
| | | * | | | | Use same values for Text.lineHeightMode and QTextBlock::lineHeightMode from ↵Yann Bodson2011-02-095-16/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master. - MultiplyHeight becomes ProportionalHeight - PixelHeight becomes FixedHeight Change-Id: I2a1ebc6ff9db7e62f513919f19773f985b08f8d7 Reviewed-by: Michael Brasser
| | | * | | | | Don't clear pre-edit text when a graphics items loses focus.Andrew den Exter2011-02-092-14/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't forceably reset the input method state when a graphics item loses focus, reset the input context and let it handle sending the appropriate events itself. That way behavior is consistent with QWidget and the input context can opt to commit its current pre-edit text instead of discarding it. And don't change the focus until after the input context has been reset or the input method events won't be delivered. Change-Id: Ic545bccab6bf671709c1d06d499217baf614e6f9 Task-number: QTBUG-16997 Reviewed-by: axis
| | * | | | | | Fix docs for variant and list basic typesBea Lam2011-02-091-99/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it clear that QML properties never store JavaScript object data, and that inefficient serialization must be performed when JavaScript objects are copied to QML properties. Task-number: QTBUG-16624
generated by cgit v0.12 at 2025-01-22 15:06:51 (GMT)