summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Clarify QmlPropertyMap::valueChanged docs.Michael Brasser2010-01-221-1/+4
|
* Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Nigel Hietala2010-01-214-7/+18
|\ | | | | | | into kinetic-declarativeui
| * Speed up QmlGraphicsItem construction.Bjørn Erik Nilsen2010-01-211-4/+6
| | | | | | | | | | | | | | | | | | It's much faster to just initalize the flags in the constructor of QmlGraphicsItemPrivate than doing a full blown QGraphicsItem::setFlags. We can perfectly do this because QmlGraphicsItem does not listen to any itemChange events related to those flags. Reviewed-by: Aaron Kennedy
| * Fixed possible array index-out-of-bounds crash in error reporting.Erik Verbruggen2010-01-212-2/+12
| |
| * Remove unused variable.Alexis Menard2010-01-211-1/+0
| |
* | Updated graphics for SamegameNigel Hietala2010-01-216-0/+1
|/
* Fixes: Allows qtcreator to build on system installed qt-kineticBill King2010-01-211-1/+1
|
* Allow composite value sourcesAaron Kennedy2010-01-214-5/+38
|
* Rename ListModel::set() to ListModel::setProperty()Aaron Kennedy2010-01-203-10/+10
| | | | | As QML doesn't support slot overloading, the two ListModel::set() calls must be separated.
* CrashAaron Kennedy2010-01-201-1/+1
|
* Add more detailed debuggingAaron Kennedy2010-01-202-2/+4
|
* Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Bea Lam2010-01-2018-60/+195
|\ | | | | | | into kinetic-declarativeui
| * Remove qHash(QUrl) duplicateMartin Jones2010-01-201-9/+2
| |
| * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2010-01-2018-49/+186
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * CompileAaron Kennedy2010-01-201-1/+1
| | |
| | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2010-01-20196-2307/+3333
| | |\ | | | | | | | | | | | | into kinetic-declarativeui
| | | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2010-01-203-41/+31
| | | |\ | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | * | Compile with Qt 4.6.1Aaron Kennedy2010-01-2018-47/+186
| | | | |
| | * | | Remove debuggingAaron Kennedy2010-01-191-2/+0
| | | | |
| * | | | Add qHash(QUrl) for QmlPixmapCache.Martin Jones2010-01-201-0/+5
| | |_|/ | |/| |
| * | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2010-01-2049-264/+570
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Use Q_GLOBAL_STATIC for static global.Martin Jones2010-01-201-11/+11
| | | | |
* | | | | Keep empty lists and 1-item lists as lists instead of converting themBea Lam2010-01-202-21/+103
| |/ / / |/| | | | | | | | | | | | | | | to null or single objects. This brings back change bc6940f with additional fixes and tests.
* | | | Revert previous change. Does not work for statically defined list models.Bea Lam2010-01-202-30/+20
| |_|/ |/| | | | | | | | This reverts commit bc6940f53891856a3a6c3d8f1c25a8eaada90b33.
* | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2010-01-207-25/+55
|\ \ \ | |/ / | | | | | | into kinetic-declarativeui
| * | Add support for aliases in test http server.Martin Jones2010-01-202-1/+19
| | | | | | | | | | | | | | | Makes it possible to request many files with unique names, but serve a single file.
| * | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2010-01-201-1/+1
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2010-01-19132-1970/+3070
| | |\ \ | | | | | | | | | | | | | | | into kinetic-declarativeui
| | * | | Make QmlGraphicsAnchors a NOCREATE type.Michael Brasser2010-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | Prevents the creation benchmark from qFataling.
| * | | | Avoid using QUrl::toString() in QmlPixmapCache.Martin Jones2010-01-202-21/+32
| | |/ / | |/| |
| * | | Remove unnecessary semicolonMartin Jones2010-01-191-1/+1
| | | |
| * | | Fix examples/declarative/plugins exampleAlan Alpert2010-01-191-1/+2
| | | |
* | | | Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-2047-234/+550
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp
| * | | QMetaObject::disconnectOne()Aaron Kennedy2010-01-204-7/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a disconnectOne() method that allows a single signal/slot connection to be disconnected, as required by QTBUG-6781. Reviewed-by: Warwick Allison Reviewed-by: Olivier Goffart
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-1932-192/+322
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Memory leak in native Toolbar cleanup in Cocoa Fix copyright year. Bump version to 4.6.2. Add skeleton changes file for 4.6.2. Add released version of 4.6.1 changes file for posterity. Designer crashes when previewing QMainWindow with native Toolbar on Mac
| | * | | Memory leak in native Toolbar cleanup in CocoaNils Jeisecke2010-01-191-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QCocoaToolBarDelegate is not released when destroying the QMainWindowLayout. Task-number: QTBUG-7307 Reviewed-by: Prasanth Ullattil
| | * | | Fix copyright year.Jason McDonald2010-01-1911-11/+11
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Bump version to 4.6.2.Jason McDonald2010-01-1918-24/+24
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Add skeleton changes file for 4.6.2.Jason McDonald2010-01-191-0/+159
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Add released version of 4.6.1 changes file for posterity.Jason McDonald2010-01-191-157/+104
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Designer crashes when previewing QMainWindow with native Toolbar on MacPrasanth Ullattil2010-01-191-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash happens when a QMainWindow with a native toolbar is reparented. While re-parenting, the QToolBar triggers a new setParent() with the MacWindowToolBarButtonHint. This messes up the internal state, hence the crash. To avoid re-entering setParent() for the QMainWindow, this hint is set depending on the unifiedTitleAndToolBarOnMac property. This patch also fixes a related issue in Cocoa, we need to remove the reused NSToolbar from the old window while recreating the QMainWindow. Task-number: QTBUG-7162 Reviewed-by: Richard Moe Gustavsen
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-191-1/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Return some fake data if we can't handle the network request.
| | * | | | Return some fake data if we can't handle the network request.kh12010-01-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we are the only handler for network request and cannot forward the request to our parent (e.g. unwanted net access), we work arround the case we can't handle it. We do create a reply with dummy data which will prevent some blocking and allows further processing of requested data. Task-number: QTBUG-7427 Reviewed-by: kh
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-194-16/+66
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Make the qWarnings in the animation API more useful. Fixed y-inverted pixmaps on N900. Fix X11/EGL builds using OpenGL ES 1.1 Fix Typo
| | * | | | Make the qWarnings in the animation API more useful.Alexis Menard2010-01-191-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number:QTBUG-6895 Reviewed-by:Thierry
| | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-192-7/+46
| | |\ \ \ \
| | | * | | | Fix X11/EGL builds using OpenGL ES 1.1Tom Cooksey2010-01-191-6/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7399 Reviewed-By: TrustMe
| | | * | | | Fix TypoThomas Zander2010-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Alan Alpert
| | * | | | | Fixed y-inverted pixmaps on N900.Gunnar Sletta2010-01-191-4/+8
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QGLPixmapData used default bind options, which means that the pixmap is always flipped up-side-down and rendered with flipping. The opaque pixmaps were uploaded unflipped which caused the bug. Ideally we do not want pixmap flipping so change the default in gl pixmaps and tag it accordingly. Reviewed-by: Samuel
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-193-3/+42
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNativeSocketEngine windows: Fix performance degredation in write() Remove QtScript connection when receiver QObject has been deleted
generated by cgit v0.12 at 2025-08-17 17:07:20 (GMT)