summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Mac: Make universal ppc/x86 builds compile.Morten Johan Sørvig2010-04-071-0/+7
| | | | We need to enable/disable MMX etc at compile time, not at configure time.
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-0722-169/+564
|\
| * compile fix for WinCE Armv4iMaurice Kalinowski2010-04-071-0/+4
| | | | | | | | | | | | missing include Reviewed-by: Joerg Bornemann
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-0755-187/+2076
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix non-bootstrapped qmake build comment out variable which is used only by commented out debug code Cocoa: remove hackish code that is no longer needed Cocoa: mouse release event reports wrong button state Autotest: added more tests to macnativeevents (2) Cocoa: send mouse move event upon a mouse enter Autotest: added more tests to macnativeevents qdoc: Added many png, js, and css files for new format. Test case for QMenu::popup() QMenu::popup() code style fixes fix QMenu::popup() qdoc: Added <div> elements to some html output for Fake nodes.
| | * fix non-bootstrapped qmake buildOswald Buddenhagen2010-04-071-0/+2
| | |
| | * comment out variable which is used only by commented out debug codeOswald Buddenhagen2010-04-071-1/+1
| | |
| | * Cocoa: remove hackish code that is no longer neededRichard Moe Gustavsen2010-04-073-57/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | After Carlos' patch (0c442405a9f85), the code in the event dispatcher that tried to restore correct window level (or actually block cocoa from setting the wrong level) can now be removed. Tested on 10.5 and 10.6. Reviewed-by: cduclos
| | * Cocoa: mouse release event reports wrong button stateRichard Moe Gustavsen2010-04-071-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | If you release the mouse over a non-client area, the following mouse up event contains the mouse button that was released in the 'buttons' state. This is wrong, according to the documentation (and the native events auto test!) Reviewed-by: msorvig
| | * Autotest: added more tests to macnativeevents (2)Richard Moe Gustavsen2010-04-075-14/+136
| | |
| | * Cocoa: send mouse move event upon a mouse enterRichard Moe Gustavsen2010-04-071-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On all platforms, we always send a mouse move event when the mouse enters a widget (if mouse tracking is on, that is). Then macnativeevents auto test revealed that we did not do this for the cocoa port. This patch will fix this. Reviewed-by: cduclos Reviewed-by: prasanth
| | * Autotest: added more tests to macnativeeventsRichard Moe Gustavsen2010-04-079-87/+391
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-065-15/+14
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Moved item wouldn't follow mouse cursor when ItemIgnoresTransformations is set Fix painting artifacts on text Prevented unnecessary copy in QImage::setAlphaChannel(). Change the ifdef for resolving function ptrs to match declaration
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-065-15/+14
| | |\ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Moved item wouldn't follow mouse cursor when ItemIgnoresTransformations is set Fix painting artifacts on text Prevented unnecessary copy in QImage::setAlphaChannel(). Change the ifdef for resolving function ptrs to match declaration
| | * | Moved item wouldn't follow mouse cursor when ItemIgnoresTransformations is setGabriel de Dietrich2010-04-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the introduction of transform properties in QGraphicsItem, QGraphicsItem::transform() is no longer enough to get the correct transform of an item. No auto-test as it involves mouse dragging. Reviewed-by: Yoann Task-number: QTBUG-9295
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-04-06318-5597/+6800
| | |\ \
| | | * | Prevented unnecessary copy in QImage::setAlphaChannel().Samuel Rødal2010-04-061-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the formats don't match the detch is unnecessary as operator= will anyways destroy the detached QImageData and substitute it with the newly created QImageData from convertToFormat. Task-number: QTBUG-9640 Reviewed-by: Trond
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-061-1/+1
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Change the ifdef for resolving function ptrs to match declaration
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-061-1/+1
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Change the ifdef for resolving function ptrs to match declaration
| | | | | * | Change the ifdef for resolving function ptrs to match declarationTom Cooksey2010-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| | * | | | | Fix painting artifacts on textEskil Abrahamsen Blomfeldt2010-04-062-10/+7
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The height of the row is not only decided by the maximum height of the set of glyphs currently being added to the glyph cache, but also the height of the glyphs previously added to the current line in the glyph cache. To minimize the space used, we now calculate the maximum height for glyphs per line, and use this as the vertical advancement when positioning the next line in the cache. The change also removes a redundant test ((c_x + c.w > c.h) is caught earlier on and will always be false at this point.) Task-number: QTBUG-9176 Reviewed-by: Trond
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-066-3/+31
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: update the QDBusPendingCallWatcher example to show where to delete Doc: Remove QDBusServer from the public documentation. [Cocoa] QDialogs with WindowStayOnStopHint parent Fix a coding style issue of the GTK style Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors Added variable QMAKE_TARGET.arch to qmake to be used with MSVC++
* | | | | | qdoc: Added many png, js, and css files for new format.Martin Smith2010-04-0736-0/+2
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Coming soon! Task: QTBUG-9504
* | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-0716-34/+605
|\ \ \ \ \
| * | | | | Test case for QMenu::popup()miniak2010-04-071-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Verifies that the menu shown is fully contained on the screen. The actual menu position on the screen is checked as well. Merge-request: 551 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| * | | | | QMenu::popup() code style fixesminiak2010-04-071-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 551 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| * | | | | fix QMenu::popup()miniak2010-04-071-4/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Merge-request: 551 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| * | | | Doc: update the QDBusPendingCallWatcher example to show where to deleteThiago Macieira2010-04-061-0/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8865
| * | | | Doc: Remove QDBusServer from the public documentation.Thiago Macieira2010-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5066
| * | | | [Cocoa] QDialogs with WindowStayOnStopHint parentCarlos Manuel Duclos Vergara2010-04-061-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is with beginModalSession which reorders the windows and sends our window back. This patch queries the window level before calling beginModalSession and sets it after beginModalSession. Task-number: QTBUG-9392 Reviewed-by: Richard Moe Gustavsen
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-063-1/+21
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix a coding style issue of the GTK style Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors Added variable QMAKE_TARGET.arch to qmake to be used with MSVC++
| | * | | Fix a coding style issue of the GTK styleBenjamin Poulain2010-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | A tab was introduced in 16614121f8eff813efadc999a7db9ce47eae769e
| | * | | Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errorsJohan Hauan2010-04-062-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GTK Style A QHashableLatin1Literal was a bit too clever for sunstudio. Added and alternate constructor for sunstudio(ifdef) Should not affect other compilers. Other: Minor compile fixes, extra semicolon after macros etc. Merge-request: 547 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | * | | Added variable QMAKE_TARGET.arch to qmake to be used with MSVC++Zeno Albisser2010-04-061-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The variable QMAKE_TARGET.arch shall be used to determine cross compiling for x64 on a x32 system. Reviewed-by: Marius Storm-Olsen Task-number: QTBUG-9160
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-068-2/+490
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix anchors, etc. Labs (experimental) Gesture support.
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-06244-4153/+4402
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-068-2/+491
| | | |\ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Labs (experimental) Gesture support.
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-064-8/+4
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Empty commit to trigger rebuilding in the CI system. Make it possible to build QtDBus and its tools on Windows CE. Reapply 69e873e2bfae3fc028c21d93112a75008c3bb58b now that QLibrary is fixed
| | | * | | Fix anchors, etc.Warwick Allison2010-04-062-2/+1
| | | |/ / | | | | | | | | | | | | | | | (pass parser status up to QDeclarativeItem)
| | | * | Labs (experimental) Gesture support.Warwick Allison2010-04-068-2/+491
| | | | | | | | | | | | | | | | | | | | By popular demand.
* | | | | qdoc: Added many png, js, and css files for new format.Martin Smith2010-04-0737-0/+1438
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Coming soon! Task: QTBUG-9504
* | | | | qdoc: Added <div> elements to some html output for Fake nodes.Martin Smith2010-04-061-4/+8
| |/ / / |/| | | | | | | | | | | Task: QTBUG-9504
* | | | Empty commit to trigger rebuilding in the CI system.Thiago Macieira2010-04-050-0/+0
| | | |
* | | | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-050-0/+0
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-041-18/+20
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revert "Attempt at fixing Phonon build issue on Symbian."
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-041-3/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Attempt at fixing Phonon build issue on Symbian.
* | | | | | Make it possible to build QtDBus and its tools on Windows CE.Thiago Macieira2010-04-053-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This of course requires installing libdbus compiled for Windows CE too. Task-number: QTBUG-9582 Patch-by: Romain Pokrzywka (from KDAB)
* | | | | | Reapply 69e873e2bfae3fc028c21d93112a75008c3bb58b now that QLibrary is fixedThiago Macieira2010-04-041-1/+1
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was: " Avoid a data relocation by not trying to store a pointer in the .data section of plugins. Reviewed-By: Rohan McGovern "
* | | | | Revert "Attempt at fixing Phonon build issue on Symbian."Thiago Macieira2010-04-041-18/+20
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7992ea34f9f1ed67d4e44f43c3a8133ae5aa3ac4. Turns out that this had already been fixed before the update to 4.4.0, but never upstreamed. Revert to the fixed version. I'll upstream the bugfix.
* | | | Attempt at fixing Phonon build issue on Symbian.Thiago Macieira2010-04-041-3/+5
|/ / / | | | | | | | | | | | | | | | | | | Why, why did someone think that template QObjects with partially exported symbols was a good idea? Reviewed-by: Trust Me
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-031-0/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: [plugins] Don't conclude that a .debug file is a plugin.
generated by cgit v0.12 at 2024-10-26 06:38:14 (GMT)