summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Setting the size of a loader overwrote its implict size.Martin Jones2011-01-272-4/+21
| | | | | | | | If the created item does not have a valid width/height then our implictWidth/Height should be the same as the items implict size. Task-number: QTBUG-16928 Reviewed-by: Bea Lam
* Implement property versioning inside the declarative engineAaron Kennedy2011-01-2717-121/+441
| | | | Task-number: QTBUG-13451
* Fix warnings.Michael Brasser2011-01-251-2/+2
|
* Fix critical spelling mistake.Martin Jones2011-01-251-1/+1
|
* Add location information for tracing.Michael Brasser2011-01-255-12/+63
|
* Add "Complete" message for tracing.Michael Brasser2011-01-252-0/+7
|
* Notify that pressed has changed before calling the onClicked handler.Michael Brasser2011-01-251-1/+2
| | | | | | | This is a more natural ordering, and makes it trivial to control different state groups with pressed and onClicked. Reviewed-by: Martin Jones
* Improve information reported for MouseArea hover events.Michael Brasser2011-01-251-2/+6
| | | | Reviewed-by: Martin Jones
* Fix copy-paste error in QDeclarativeMouseArea::hoverMoveEvent.Michael Brasser2011-01-251-1/+1
| | | | Reviewed-by: Martin Jones
* Expose implicitWidth and implicitHeight properties of Item.Martin Jones2011-01-2426-57/+514
| | | | | | | | Overridden as readonly for elements that have an inherent implicit size such as Text, TextEdit, TextInput, positioners, Loader. Task-number: QTBUG-14957 Reviewed-by: Michael Brasser
* Change Qt.application.layoutDirection from bool to correct type of ↵Joona Petrell2011-01-192-4/+13
| | | | | | | Qt::LayoutDirection Task-number: QTBUG-16424 Reviewed-by: Martin Jones
* Add a layout direction example to positionersJoona Petrell2011-01-191-11/+12
| | | | | Task-number: Reviewed-by: Alan Alpert
* Rename Image::cached to 'cached' (and QDeclarativePixmap::Cached also)Bea Lam2011-01-197-26/+26
| | | | | | | | This is to keep consistent property naming consistent. E.g. Image has 'smooth', 'mirror' properties rather than 'smoothed', 'mirrored'. For consistency QDeclarativePixmap::Cached was renamed as well. Reviewed-by: Martin Jones
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-193851-4893/+11325
|\
| * TextEdit implicit size varied depending upon wrapMode.Martin Jones2011-01-191-2/+6
| | | | | | | | | | | | | | | | We failed to reset textWidth before calculating the ideal width of the text. Task-number: QTBUG-16710 Reviewed-by: Michael Brasser
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-01-182-4/+7
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging: Revert "Add a warning about trying to release a timer ID that isn't active" Some unit tests for layout explosion thingy Fix a bug that got revealed by 604c51f1fc5c79b7fad12cda911b06b9e6e5005f Build failure fix (related to QT-4079) QWidgets support for VGA screen
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-01-182-4/+7
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging: Revert "Add a warning about trying to release a timer ID that isn't active" Some unit tests for layout explosion thingy Fix a bug that got revealed by 604c51f1fc5c79b7fad12cda911b06b9e6e5005f Build failure fix (related to QT-4079) QWidgets support for VGA screen
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-01-173-5/+7
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging: Revert "Add a warning about trying to release a timer ID that isn't active" Some unit tests for layout explosion thingy Fix a bug that got revealed by 604c51f1fc5c79b7fad12cda911b06b9e6e5005f Build failure fix (related to QT-4079) QWidgets support for VGA screen
| | | | * Merge branch '4.7-review' into 4.7-stagingThierry Bastian2011-01-173-5/+7
| | | | |\
| | | | | * Revert "Add a warning about trying to release a timer ID that isn't active"Jan-Arve Sæther2011-01-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e1955231478df8990cf8b1f80438abf957c5d6f2. In a patch release this is the best way of fixing the problem of warnings. This will be fixed properly in 4.8 Reviewed-by: Gabriel Task-number: QTBUG-16175
| | | | | * Fix a bug that got revealed by 604c51f1fc5c79b7fad12cda911b06b9e6e5005fJan-Arve Sæther2011-01-131-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug has been around for a while, but change 604c51f1fc5c7 made it emerge. The problem was that stretches were combined by always *maxing* them. The values of 'stretch' can be interpreted as this: -1: (the default) it means that the items should be stretched with the stretch factor dervived from the size hints. (In practice this means that they are distributed fairly). 0: Means that the item should not be stretched >0: Means that the item should be stretch with that number as a factor. This meant that combining one item with a fixed size(0) and another item with a default stretch (-1) the combined row stretch would end up being fixed. This also fixes how stretches are combined for spanning items too. Task-number: QTBUG-13551 Reviewed-by: John Tapsell
| | | | | * Build failure fix (related to QT-4079)Sami Merila2011-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change d281cea3a445aa244901decceffd7d653ed829c8 caused build failure, due to missing comma (one line missing from commit). Fixed by adding the missing change. Task-number: QT-4079 Reviewed-by: Miikka Heikkinen
| | | | | * QWidgets support for VGA screenSami Merila2011-01-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add pixelmetrics data for QS60Style to support VGA screensizes. Task-number: QT-4079 Reviewed-by: Miikka Heikkinen
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-181-2/+10
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix to data detaching in OpenVG pixmap data Remove toolcheck from generic clean targets for symbian-sbsv2
| | * | | | Fix to data detaching in OpenVG pixmap dataJani Hautakangas2011-01-181-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QImage::converToFormat(format) won't detach QImage if format stays the same. Because of this, internal QImage buffer of QVGPixmapData was not deep copied. Drawing to QPixmap target modified the original QImage that was used to create QPixmap and in some cases crashed because paint engine referred to wrong target. Task-number: QT-4407 Reviewed-by: Jason Barron
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-186-20/+54
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Request font sizes with only 0.5pt resolution.
| | * | | | Request font sizes with only 0.5pt resolution.Martin Jones2011-01-186-20/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When animating pointSize avoid generating a huge number of fonts with slightly different point sizes. Task-number: QTBUG-13960 Reviewed-by: Aaron Kennedy
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-181-1/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Revert "Add a warning about trying to release a timer ID that isn't active"
| | * | | | Revert "Add a warning about trying to release a timer ID that isn't active"Olivier Goffart2011-01-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e1955231478df8990cf8b1f80438abf957c5d6f2. Revert it in Qt 4.7 because the warning is triggered a lot by Qt itself They are going to be fixed in master. Reviewed-by: Thierry Task-number: QTBUG-16175
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-179-19/+19
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Make qvfb compile (and work) with libpng 1.5 Updates to Galician localization don't misdetect powermac host systems when determining target arch Implementation of QNetworkProxyFactory::systemProxyForQuery() for Symbian make sure Option::dir_sep is initialized in time don't ignore return code from syncqt make qtlibinfix apply to QT_INSTALL_TRANSLATIONS clean up platform detection logic accept -declarative-debug under unix Fix static build on Windows with MinGW. fix -enable-stdcall-fixup usage don't claim declarative debugging support without having declarative installation of translations is now dealt with by translations.pro German translation fixes fix typo in error messages
| | * | | | Fix static build on Windows with MinGW.Mark Brand2011-01-178-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Q_DECL_IMPORT is still __declspec(dllimport), which is unsuitable for static code. Commit edbc656b changed Q_DECL_IMPORT_IMPORT to Q_CORE_EXPORT when declaring QtCore functions in svg. Now we change Q_DECL_IMPORT to Q_GUI_EXPORT when declaring QtGui functions into opengl and openvg. Also removed the redundant keyword "extern" from the function declarations. Merge-request: 2540 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: mariusSO
| | * | | | fix typo in error messagesOswald Buddenhagen2011-01-171-1/+1
| | | |/ / | | |/| | | | | | | | | | | | Task-number: QTBUG-16369
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-179-41/+193
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix one character displacement for cursor in line edits Fix header not found build error QTBUG-16110 updating the softkeys when app comes to foreground Workaround crash when multiple QNetworkAccessManager instances are used
| | * | | Fix one character displacement for cursor in line editsMiikka Heikkinen2011-01-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The variable m_inlinePosition was not updated when m_preeditString was cleared in QCoeFepInputContext. This resulted in cursor displaying up one character beyond where it logically should have been when using HW Qwerty keyboard on E7 and similar devices. Task-number: QTBUG-16238 Reviewed-by: axis
| | * | | Fix header not found build errorShane Kearns2011-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | Task-Number: QT-4378
| | * | | QTBUG-16110 updating the softkeys when app comes to foregroundmread2011-01-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an app is in the background and creates a window with softkeys, the softkeys are not updated when the app comes to the foreground, so they look faded. This change updates the softkeys when the app comes to the forground. Task-number: QTBUG-16110 Reviewed-by: Jason Barron
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-177-41/+188
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Workaround crash when multiple QNetworkAccessManager instances are used
| | | * | | Workaround crash when multiple QNetworkAccessManager instances are usedShane Kearns2011-01-147-41/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of each QNetworkAccessManager owning a QNetworkSession, they now share a QNetworkSession if they have the same QNetworkConfiguration. QNetworkAccessManager now uses passive roaming instead of application level roaming. The state change signal (entering connected state) is used to indicate reconnection instead of being triggered when sending an ALR accept(). This preserves the previous behaviour, as QNAM always accepted the suggested access point from bearer mobility. In the case of multithreaded applications, one QNetworkSession will be created for each thread which uses QNetworkAccessManager, as QNetworkSession is not thread safe. Task-number: QT-4378 Reviewed-by: Markus Goetz Reviewed-by: juhvu
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-171-1/+3
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix double click event on Mac OS X.
| | * | | | Fix double click event on Mac OS X.Fabien Freling2011-01-171-1/+3
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix an issue where the double click would be triggered even with different mouse buttons. Task-number: QTBUG-8222 Reviewed-by: Richard Moe Gustavsen
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-172-0/+9
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Autotest for QVariant value types Fix memory leak Clarify Component.createObject(null) behavior.
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-142-0/+9
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Autotest for QVariant value types Fix memory leak Clarify Component.createObject(null) behavior.
| | | * | Fix memory leakAaron Kennedy2011-01-141-0/+5
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16526
| | | * | Clarify Component.createObject(null) behavior.Martin Jones2011-01-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting the parent of the returned item does not affect its object ownership so care must be taken to ensure it is not garbage collected. Task-number: QTBUG-16630 Reviewed-by: Aaron Kennedy
| * | | | various fixes to deal with CI gate failuresJeremy Katz2011-01-141-15/+15
| | | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-142-0/+269
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix system proxy test: QNetworkProxyFactory::systemProxyForQuery() is static QNetworkProxyFactory::systemProxyForQuery() for Symbian
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-132-0/+269
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix system proxy test: QNetworkProxyFactory::systemProxyForQuery() is static QNetworkProxyFactory::systemProxyForQuery() for Symbian
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-132-0/+269
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNetworkProxyFactory::systemProxyForQuery() for Symbian
| | | | * | QNetworkProxyFactory::systemProxyForQuery() for SymbianJyrki Jaakkola2011-01-122-0/+269
| | | | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-141-3/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Proper fix for QGraphicsItem crash.