summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Implement property versioning inside the declarative engineAaron Kennedy2011-01-2731-178/+494
| | | | 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-253-1/+65
| | | | | | | 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-2429-57/+652
| | | | | | | | 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
* Add list of new properties/methods in QtQuick 1.1Martin Jones2011-01-242-1/+116
|
* 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-1911-16/+197
| | | | | Task-number: Reviewed-by: Alan Alpert
* Update demos following renaming of Image::cachedBea Lam2011-01-191-2/+2
|
* Rename Image::cached to 'cached' (and QDeclarativePixmap::Cached also)Bea Lam2011-01-198-33/+33
| | | | | | | | 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-1910512-16218/+21370
|\
| * Cleanup created views in TextEdit tests.Martin Jones2011-01-191-0/+12
| | | | | | | | Reviewed-by: Michael Brasser
| * 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-184-4/+191
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-184-4/+191
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-184-4/+191
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-175-5/+191
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-175-5/+191
| | | | | |\
| | | | | | * Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-01-141-1/+0
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: 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"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
| | | | | | * | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-01-133-2/+187
| | | | | | |\ \ | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Some unit tests for layout explosion thingy Fix a bug that got revealed by 604c51f1fc5c79b7fad12cda911b06b9e6e5005f
| | | | | | | * Some unit tests for layout explosion thingyJohn Tapsell2011-01-131-0/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds more tests for commit 7fbf1829e11504eca6a55f1e5dbddf2f658b5302 Task-number: QTBUG-13551
| | | | | | | * Fix a bug that got revealed by 604c51f1fc5c79b7fad12cda911b06b9e6e5005fJan-Arve Sæther2011-01-132-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | * | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-01-101-2/+4
| | | | | | |\ \ | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Build failure fix (related to QT-4079) QWidgets support for VGA screen
| | | | | | | * 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-182-8/+13
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Generate createpackage calls with absolute path. Added detection of bat files to the qtPrepareTool function.
| | * | | | | | Generate createpackage calls with absolute path.Miikka Heikkinen2011-01-181-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that the correct version of the script is always called. Task-number: QTBUG-16687 Reviewed-by: axis
| | * | | | | | Added detection of bat files to the qtPrepareTool function.axis2011-01-181-1/+7
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all tools end with .exe. Some also end in .bat. RevBy: Oswald Buddenhagen
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-182-5/+15
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | Remove toolcheck from generic clean targets for symbian-sbsv2Miikka Heikkinen2011-01-181-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Toolcheck can cause generic clean fail (i.e. "make clean" or "make debug-clean") for e.g. environments where Carbide command line tools have not been installed, because sbsv2 toolchain does a check for all tools related to target platforms, even though they are not needed for actual cleaning. Task-number: QTBUG-16691 Reviewed-by: Janne Koskinen
| * | | | | | 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/qt-s60-public into ↵Qt Continuous Integration System2011-01-181-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: tst_qhttp: replace legacy qt-test-server hostname in testdata.
| | * | | | | | tst_qhttp: replace legacy qt-test-server hostname in testdata.Rohan McGovern2011-01-181-2/+2
| | |/ / / / /
| * | | | | | 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-1734-1548/+1843
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | Make qvfb compile (and work) with libpng 1.5Bernhard Rosenkraenzer2011-01-171-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In libpng >= 1.5.0, the png_info struct is no longer exported Merge-request: 1023 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | | | Updates to Galician localizationmarce villarino2011-01-172-1362/+1678
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1024 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | | | don't misdetect powermac host systems when determining target archKonstantin Tokarev2011-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6150 Merge-request: 2549 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | | | Implementation of QNetworkProxyFactory::systemProxyForQuery() for SymbianJeremy Katz2011-01-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implementation replaces the default do-nothing version, querying the device's commsdat for appropriate entries. Task-number: QTBUG-13857 Reviewed by: Jeremy Katz et al.
| | * | | | | make sure Option::dir_sep is initialized in timeOswald Buddenhagen2011-01-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | querying $$DIR_SEPARATOR (possibly indirectly via $$QMAKE_DIR_SEP) may happen before querying any os scopes, so better make it initialize the host mode explicitly. loading features theoretically needs an initialized dir_sep as well (to detect relative paths), so take care of that as well. Task-number: QTBUG-10633 Reviewed-by: mariusSO
| | * | | | | don't ignore return code from syncqtOswald Buddenhagen2011-01-172-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16176 Reviewed-by: mariusSO
| | * | | | | make qtlibinfix apply to QT_INSTALL_TRANSLATIONSOswald Buddenhagen2011-01-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the unix configure already got it right Task-number: QTBUG-15978 Reviewed-by: Alessandro Portale Reviewed-by: mariusSO