summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'qtquick11' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-054-5/+19
|\
| * Add missing test data fileBea Lam2011-01-051-0/+8
| |
| * Add clarifications to QML SQL docs.Michael Brasser2011-01-052-4/+5
| | | | | | | | Reviewed-by: Bea Lam
| * Fix translation in Connections element.Michael Brasser2011-01-041-1/+6
| | | | | | | | | | | | | | | | Provide the component's file name to the expression as the translation context. Task-number: QTBUG-10300 Reviewed-by: Martin Jones
* | Support property/method versions in QMLMartin Jones2011-01-0541-53/+883
| | | | | | | | | | | | | | | | Use metaobject revisioning to exclude properties/revisions added in later versions from interfering with earlier versions. Task-number: QTBUG-13451 Reviewed-by: Aaron Kennedy
* | Allow a revision to be associated with properties and methods.Martin Jones2011-01-0513-16/+311
|/ | | | | | | | | | | | | | | | | | | Allows a revision to be associated with properties via: Q_PROPERTY(int prop READ prop1 REVISION 1) Allows a revision to be associated with methods via either: public slots Q_REVISION(1): void method1(); or: public slots: Q_REVISION void method1(); Private revision() methods are added to QMetaProperty and QMetaMethod to access the revision info. This is private API for use by QML for now. Task-number: QTBUG-13451 Reviewed-by: Kent Hansen
* Fix results of number() queries for zero and non-number valuesBea Lam2011-01-043-25/+64
| | | | | | | | | Use xs:string() to test whether a value is empty, instead of using a simple boolean check which fails for zero-type values. This fix also means 'NaN' is returned for non-number (including empty) values. Task-number: QTBUG-16423, QTBUG-16265 Reviewed-by: Michael Brasser
* Provide qmlviewer warning window also on SymbianJoona Petrell2010-12-313-31/+35
| | | | | Task-number: QTBUG-10800 Reviewed-by: Christopher Ham
* Use deselect() function in text selection exampleJoona Petrell2010-12-311-1/+1
| | | | | Task-number: QTBUG-16059 Reviewed-by: Christopher Ham
* Add convenience deselect() functions to TextInput and TextEditJoona Petrell2010-12-306-0/+40
| | | | | Task-number: QTBUG-16059 Reviewed-by: Christopher Ham
* Forward qmlviewer traces to system's default message handler on SymbianJoona Petrell2010-12-301-4/+3
| | | | | Task-number: QTBUG-16353 Reviewed-by: Christopher Ham
* Optimization: make QDeclarativePropertyPrivate shared.Michael Brasser2010-12-222-47/+64
| | | | | Task-number: QTBUG-15331 Reviewed-by: Aaron Kennedy
* QDeclarativeDebug: Remove unused fileKai Koehne2010-12-212-1/+0
| | | | Got added in 5336e1838a95d97.
* Adding autotest coverage to QDecalarativeGridViewChristopher Ham2010-12-211-0/+92
| | | | | | Tests added for snapping, and adding coverage for TopToBottom flow Reviewed-by: Martin Jones
* ContentX and ContentY reset on flow changeChristopher Ham2010-12-211-0/+2
| | | | | | | | The gridView should be visible when the flow is changed, regardless of the content position before the flow change. Task-number: QTBUG-16230 Reviewed-by: Martin Jones
* Fix potential crash in PropertyChanges binding rewrite handling.Michael Brasser2010-12-213-27/+42
| | | | | | | This fixes the autotest regression for tst_qdeclarativestates::editProperties introduced by 488e616b50707e5b37162e6d0cfc71a1ffdf9bef. Reviewed-by: Joona Petrell
* Optimize QByteArray to QString conversion in PropertyChanges.Michael Brasser2010-12-214-64/+62
| | | | | | | | Perform the conversion once at compile time, rather than many times later. Task-number: QTBUG-15331 Reviewed-by: Martin Jones
* Optimize name lookup for QDeclarativeProperty.Michael Brasser2010-12-211-0/+2
| | | | | | | | | If the property is constructed by passing in the property name (and we've verified that it is valid), we can cache that name immediately rather than reconstructing it on the first call to name(). Task-number: QTBUG-15331 Reviewed-by: Martin Jones
* Update Minehunt demo warning messageJoona Petrell2010-12-201-1/+1
| | | | | | | | The message was talking about a C++ plugin when the demo is nowadays in a form of a standalone executable. Task-number: Reviewed-by: Bea Lam
* Add copyright headerMartin Jones2010-12-201-0/+40
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Joona Petrell2010-12-2072-214/+713
|\
| * Fix deployment of minehunt for SymbianDamian Jansen2010-12-201-1/+1
| | | | | | | | Task: QT-4298
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-12-181-1/+7
| |\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Use relative include instead of absolute in default qmake.conf
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-12-181-1/+7
| | |\ | |/ / | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Use relative include instead of absolute in default qmake.conf
| | * Use relative include instead of absolute in default qmake.confMiikka Heikkinen2010-12-171-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Absolute include path breaks QtP releases which copy mkspecs under epoc32 and do not necessarily have the sources available in the original absolute path and can't patch the paths either at installation time. Task-number: QTBUG-16172 Reviewed-by: Oswald Buddenhagen
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-171-1/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix waitForOpened not working with already active configuration
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Ville Pernu2010-12-1712-36/+120
| | |\ \
| | * | | Fix waitForOpened not working with already active configurationVille Pernu2010-12-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an active QNetworkConfiguration is already in use (e.g. browser already open), the QNetworkSession::waitForOpened() did not work properly. Changed one if-statement in the function to adapt to the scenario. Reviewed-by: Perttu Pohjonen Task-number: QTBUG-565
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-175-12/+10
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix QDeclarativeState::reset() autotest Update test bitmaps for QDeclarativeImage::svg() autotest on Linux
| | * | | Fix QDeclarativeState::reset() autotestJoona Petrell2010-12-173-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current state reset mechanism does not really work for Text elements as the keeping implicit correct would require relayouting of text twice (See bug QTBUG-15118). Changed QDeclarativeState reset autotest to use Image element instead of Text element until the issue has been fixed. Task-number: Reviewed-by: Yann Bodson
| | * | | Update test bitmaps for QDeclarativeImage::svg() autotest on LinuxJoona Petrell2010-12-172-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-12-171-4/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix incorrect file name case for OpenGL libraries in symbian.conf.
| | * | | | Fix incorrect file name case for OpenGL libraries in symbian.conf.Miikka Heikkinen2010-12-171-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To support linux builds, file names must be cased correctly. Task-number: QT-4375 Reviewed-by: Miikka Heikkinen
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-174-1/+8
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add work around for bug when painting w/glTexSubImage into large texture
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-164-1/+8
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add work around for bug when painting w/glTexSubImage into large texture
| | | * | | | Add work around for bug when painting w/glTexSubImage into large textureEskil Abrahamsen Blomfeldt2010-12-164-1/+8
| | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that copying small rectangles from glTexSubImage2D into a texture which is 2048x2048 is busted on some SGX drivers, even though the driver reports 2048 as the maximum texture size. This caused text to turn into flickering garbage once the texture glyph cache had grown to its max size (e.g. when painting very many Chinese glyphs.) To work around the problem, we hardcore the maximum texture height to 1024 on this driver so that the texture glyph cache is reset whenever that size is exceeded. Task-number: QT-3971 Done-with: Samuel
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-171-1/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: typo fixed in doc/src/declarative/extending.qdoc
| | * | | | Doc: typo fixed in doc/src/declarative/extending.qdocJoerg Bornemann2010-12-161-1/+1
| | | |/ / | | |/| | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-161-1/+4
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: QmlDebugger: Fix runtime warnings about unregistered metatypes
| | * | | QmlDebugger: Fix runtime warnings about unregistered metatypesKai Koehne2010-12-161-1/+4
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check whether the type of a property is known to the metatype system before trying to read from it. That avoids lots of runtime warnings e.g. for the QSequentialGroup::currentAnimation property, which type QAbstractAnimation * isn't registered by default via qRegisterMetaType<>(). Reviewed-by: Christiaan Janssen Task-number: QTCREATORBUG-2853
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-12-163-2/+48
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Improved orientation change autotest Avoid duplicate resize event
| | * | Improved orientation change autotestMiikka Heikkinen2010-12-162-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test wasn't even compiling anymore, so fixed that. Also added additional orientation change and an available geometry check after each orientation change. Reviewed-by: Sami Merila
| | * | Avoid duplicate resize eventMiikka Heikkinen2010-12-161-2/+4
| | |/ | | | | | | | | | | | | | | | | | | | | | No need to have two resize events in queue for same widget, so do not post a new one if one is already pending in QSymbianControl::SizeChanged(). Reviewed-by: Sami Merila
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2010-12-167-32/+67
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging: Fix to commit 3778c3f5208f3db99d6b23a2a3c4abf1fe2ec64f Make sure that d->init() is called from both ctors. Fix failing tst_QGraphicsView::QTBUG_16063_microFocusRect auto-test Fixes text jitter in QtQuick components when using the virtual keyboard Symbian specific input methods should use 'Text' mode as default case Fix whitespace in qs60style.cpp QDateTimeEdit is not showing correctly when resizes in symbian QLabel wraps text at fixed lengths
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-teamQt Continuous Integration System2010-12-159-34/+118
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team: Prevent crash in drawhelper code when the cpu has MMXEXT but no SSE. Resize event for QDesktopWidget was sent too early Add extra type of embedded license. Fix possible null pointer dereference. Ensure that DBus is connected before all uses. Fix invalid configurations being added to bearermonitor list. Don't delete FBO when resetting glyph cache Trivial: Fix coding style Prevent ::flush from being called on QGLWindowSurface if no painting happened.
| | | * Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-159-34/+118
| | | |\
| | * | \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-teamQt Continuous Integration System2010-12-1428-85/+286
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team: QApplication: fix crash exit whith native windows Fixed a bug in the input methods on S60 with QGraphicsWebView. Fixed several compile and deployment issues in the mmf phonon plugin. Docs: implications of creating network access managers in other threads Clarify that XmlListModel is read only Revert a fix made for bug QTBUG-15341 Abort working replies with error when network session fails. Remove active selection when TextEdit loses focus qrgb565: Use the trivial qt_memconvert() and qt_rectconvert() Non-hacky fix for qwidget autotest Fix qapplication autotest deployment Minor optimization Fix crash when creating more than one QApplication in single test case Fixed GL 2 engine rendering of images / pixmaps above max texture size. Cocoa: popup hides behind window Cocoa: combobox does not hightlight when mouse re-hovers the first item Cocoa: Fix addChildWindow bug where we connect a grandparent to a child Cocoa: cannot use staysOnTop flag for native file dialogs Cocoa: make sure stays on top child windows are not levelled down Cocoa: native child filedialogs sometimes shows non-native on screen
| | | * | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-1428-85/+286
| | | |\ \
| | * | \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-141-1/+2
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Fix to commit 3778c3f5208f3db99d6b23a2a3c4abf1fe2ec64f Make sure that d->init() is called from both ctors.
| | | * | | Fix to commit 3778c3f5208f3db99d6b23a2a3c4abf1fe2ec64fJan-Arve Sæther2010-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This is what could happen if you go to lunch before comitting.
generated by cgit v0.12 at 2025-01-22 17:21:49 (GMT)