summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-08-2710-70/+57
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Repeater API updates.Michael Brasser2009-08-2710-70/+57
| |
* | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-08-272276-44172/+172804
|\ \ | |/ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: doc/src/declarative/anchor-layout.qdoc
| * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-08-2729-121/+112
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-262240-44037/+172412
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-267-1/+260
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | doc fixesYann Bodson2009-08-269-56/+56
| | | | |
| | * | | doc fixesYann Bodson2009-08-261-19/+7
| | | | |
| | * | | Use Q_SLOTS and Q_SIGNALS.Yann Bodson2009-08-2613-16/+16
| | | | |
| | * | | doc fixesYann Bodson2009-08-263-21/+21
| | | | |
| | * | | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-265-8/+14
| | |\ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ \ \ Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-251-6/+6
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | | small flickr fixesYann Bodson2009-08-254-4/+4
| | | | | | |
| | * | | | | doc fixesYann Bodson2009-08-251-5/+8
| | | | | | |
| * | | | | | Fix potential crash on deletion.Michael Brasser2009-08-271-5/+6
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | If an item's parent is being destructed, no need to update anchors.
| * | | | | Fix unbalanced calls to QFxPixmapCache::get && cancelGetKai Koehne2009-08-265-11/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly track whether there is a QFxPixmapCache request pending, and only call QFxPixmapCache::cancelGet if this is the case. This should fix an issue in Bauhaus where multiple instances are loading the same image, and one instance calling cancelGet without ever having called get before is messing up the QFxPixmapCache request counting.
| * | | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-08-262242-44006/+172602
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ \ \ \ Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-08-2612-9/+274
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | | | Fix and test for multiple-access-to-same-URLWarwick Allison2009-08-267-1/+260
| | | | |_|/ | | | |/| | | | | | | | | | | | | | Not reproduced (except by test), but may fix a Bauhaus issue.
| | | * | | Fix handling of empty strings for URLsWarwick Allison2009-08-264-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QUrl resolves empty to base, which is not desirable. Preserve emptiness of QUrl. Handle use of empty QUrl with WebView (WebKit doesn't handle empty URLs well either).
| | | * | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-08-256-7/+117
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | | Avoid shadowing QWebPage::view().Warwick Allison2009-08-252-4/+4
| | | | | |
| | * | | | Delete anchors when item is deleted.Michael Brasser2009-08-261-0/+1
| | | | | |
| | * | | | Some script engine cleanup.Michael Brasser2009-08-261-16/+1
| | | | | |
| | * | | | Fix compile after merge from 4.6.Michael Brasser2009-08-2526-28/+29
| | | | | |
| | * | | | Fix bad merge of QVector3D.Michael Brasser2009-08-252-10/+0
| | | | | |
| | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-08-252203-43937/+172291
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe mkspecs/features/qt.prf tools/configure/configureapp.cpp
| | | * | | Make IDirectFBImageProvider enabled by defaultAnders Bakken2009-08-252-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent using IDirectFBImageProviders one can define QT_NO_DIRECTFB_IMAGEPROVIDER Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | * | | Ensure that windows are double buffered in DFBAnders Bakken2009-08-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | * | | Render cursor with a window in dfb if desiredAnders Bakken2009-08-253-4/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some DFB implementations do not support rendering the cursor using the intended interfaces. In these cases one can define QT_DIRECTFB_WINDOW_AS_CURSOR and use a window to render the cursor. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | * | | Implement support for keeping image provider aliveAnders Bakken2009-08-254-1/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you define QT_DIRECTFB_IMAGEPROVIDER_KEEPALIVE we make sure atleast one IDirectFBImageProvider is alive at all times. Apparently this is refcounted by DirectFB on atleast one implementation and there's considerable overhead involved when releasing the last/creating the first image provider. Reviewed-by: TrustMe
| | | * | | Implement support for DirectFB image providersAnders Bakken2009-08-254-4/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reimplement QPixmapData::fromFile/fromData to load images using IDirectFBImage providers. This functionality might be accelerated on embedded boards and could have potentially large performance enhancements. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | * | | Optimize QDirectFBPaintDevice::bytesPerLineAnders Bakken2009-08-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we actually need it locked we'll probably need it locked for read|write. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | * | | Refactor QDirectFBPaintDevice/QDirectFBPixmapDataAnders Bakken2009-08-258-31/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move format into QDirectFBPaintDevice. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | * | | Doc - Removed a trailing whitespace and more cleanupsKavindra Devi Palaraja2009-08-251-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| | | * | | Doc - Reviewing documentation for QGraphicsEffect and QGraphicsEffectSourceKavindra Devi Palaraja2009-08-251-24/+30
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| | | * | | QTableWidget didn't repaint a cell after takeItemThierry Bastian2009-08-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that the mode was not emitting dataChanged. Note: This still needs to be autotested. Task-number: 234641 Reviewed-by: ogoffart
| | | * | | Fix a leak in the stylesheet textOlivier Goffart2009-08-251-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Also include some spaces fix
| | | * | | QWidgetanimator: the animations are children of the widget they animateThierry Bastian2009-08-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will remove a false pmemleak under valgrind. Reviewed-by: ogoffart
| | | * | | Fixed documentation and use of incorrect entry point for custom shaders.Samuel Rødal2009-08-253-15/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The entry point has been changed to be customShader, taking source image and texture coordinates as parameters. Reviewed-by: Tom
| | | * | | Removed warnings / debug output in the GL 2 engine / pixmap filter code.Samuel Rødal2009-08-253-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Tom
| | | * | | Micro-optimization in QPainterPath::toFillPolygonsThorbjørn Lindeijer2009-08-251-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QRectF::intersects was optimized as part of the Falcon project, and is now a bit faster than the inline version used here (drawing of dashed lines was measured to take 16% less time). Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| | | * | | animations: make sure setCurrentTime is called on all animationsThierry Bastian2009-08-252-2/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was we were iterating over the list of running animations. And when calling setCurrentTime(<duration>) on one of them they just unregister themselves from the timer and we would miss some of them. Reviewed-by: leo
| | | * | | Fix use of uninitialized memory in QLineEditOlivier Goffart2009-08-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Thierry
| | | * | | QListView:: visualRect would return incorrect valuesThierry Bastian2009-08-251-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Especially when the widget was not yet shown. Sometimes the rectangle for an item would get truncated to the size of the viewport. That should not happen: we only want to expand it to take the whole height or width of the viewport. Task-number: 243335 Reviewed-by: ogoffart
| | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Friedemann Kleint2009-08-251-0/+1
| | | |\ \ \
| | | | * | | Fix memory leak in QLineEditOlivier Goffart2009-08-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We must not forget to delete the control Reviewed-by: Paul
| | | * | | | Removed library added by mistake in 91e1f75992a5fa720ad748d8487a44b5a242ca2dFriedemann Kleint2009-08-251-28/+0
| | | |/ / /
| | | * | | doc: qdoc warning about signal not found.Bjørn Erik Nilsen2009-08-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | QPoint -> QPointF
| | | * | | Removed redundant QLocale code from QCoeFepInputContext.axis2009-08-253-93/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We export one extra private symbol from QtCore instead, and use that. RevBy: Miikka Heikkinen