summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix flicking views at boundary with StricthighlighRangeMartin Jones2010-03-243-44/+52
| | | | Task-number: QTBUG-9256
* Doc: ids start with lowercaseMartin Jones2010-03-241-9/+9
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Warwick Allison2010-03-2326-187/+636
|\ | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-2315-121/+478
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed usage of xplatform in configure. Fixed mif generation on symbian-abld. Fixed regular expression matching. More fool proof way for finding these headers Merge symbianutils from qtcreator e82219b344ee471dbb5d8e7f1351404ff9616d6c Enable installation of a sis file without running any application Replace download % display with a progress bar This file does not exist Fix configure false positives when checking for symbian Fix compile on symbian better. Make ICON generation (to symbian mif) work for relative paths/shadow builds Disable OpenVG for symbian-sbsv2 on Linux. Corrected wrong header casing. Moved -s60 and -usedeffiles options docs to Symbian section. Added rpp and rsg files to ignore filter. Forced little endianness when using symbian-sbsv2 mkspec. Fixed incorrect platform string when building for Symbian. Added -qt-style-s60 to Symbian configure options on Linux.
| | * Merge branch 'configureFixes' into 4.7-s60axis2010-03-232-8/+42
| | |\
| | | * Fixed usage of xplatform in configure.axis2010-03-231-2/+2
| | | | | | | | | | | | | | | | | | | | XQMAKESPEC contains the full path, so don't use that, since the full path could contain "symbian" by accident.
| | | * Merge branch 'linux-symbian-sbsv2-support' into 4.7-s60axis2010-03-232-8/+42
| | | |\
| | | | * Disable OpenVG for symbian-sbsv2 on Linux.axis2010-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen
| | | | * Corrected wrong header casing.axis2010-03-151-1/+1
| | | | |
| | | | * Moved -s60 and -usedeffiles options docs to Symbian section.axis2010-03-151-6/+5
| | | | |
| | | | * Added rpp and rsg files to ignore filter.axis2010-03-151-0/+2
| | | | |
| | | | * Forced little endianness when using symbian-sbsv2 mkspec.axis2010-03-151-0/+2
| | | | | | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen
| | | | * Fixed incorrect platform string when building for Symbian.axis2010-03-151-0/+2
| | | | | | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen
| | | | * Added -qt-style-s60 to Symbian configure options on Linux.axis2010-03-151-0/+31
| | | | | | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen
| | * | | Fixed mif generation on symbian-abld.axis2010-03-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have to do backslash fixing because we are using QMAKE_EXTRA_TARGETS instead of QMAKE_EXTRA_COMPILERS, which in turn is needed to get clean targets correct on the symbian/* mkspecs.
| | * | | Fixed regular expression matching.axis2010-03-231-1/+1
| | |/ / | | | | | | | | | | | | | | | | We need extra backslashes, otherwise it tries to match the '|' verbatim.
| | * | More fool proof way for finding these headersThomas Zander2010-03-231-1/+1
| | | |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-2313-111/+431
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Merge symbianutils from qtcreator e82219b344ee471dbb5d8e7f1351404ff9616d6c Enable installation of a sis file without running any application Replace download % display with a progress bar This file does not exist Fix configure false positives when checking for symbian Fix compile on symbian better. Make ICON generation (to symbian mif) work for relative paths/shadow builds
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-2313-111/+431
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Merge symbianutils from qtcreator e82219b344ee471dbb5d8e7f1351404ff9616d6c Enable installation of a sis file without running any application Replace download % display with a progress bar This file does not exist Fix configure false positives when checking for symbian Fix compile on symbian better. Make ICON generation (to symbian mif) work for relative paths/shadow builds
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-2213-111/+431
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Merge symbianutils from qtcreator e82219b344ee471dbb5d8e7f1351404ff9616d6c Enable installation of a sis file without running any application Replace download % display with a progress bar This file does not exist Fix configure false positives when checking for symbian Fix compile on symbian better. Make ICON generation (to symbian mif) work for relative paths/shadow builds
| | | | | * | Merge symbianutils from qtcreator e82219b344ee471dbb5d8e7f1351404ff9616d6cShane Kearns2010-03-226-77/+384
| | | | | | |
| | | | | * | Enable installation of a sis file without running any applicationShane Kearns2010-03-221-22/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "runonphone --sis qt.sis" Would install qt to the phone without attempting to execute any test afterwards. This feature is added because people were using runonphone as a fast way to install sis files from the command shell. Reviewed-by: axis
| | | | | * | Replace download % display with a progress barShane Kearns2010-03-221-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is to avoid flooding the console when copying a large sis file (e.g. qt.sis) to the phone. Reviewed-by: axis
| | | | | * | This file does not existThomas Zander2010-03-221-2/+1
| | | | | | |
| | | | | * | Fix configure false positives when checking for symbianThomas Zander2010-03-221-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just check the spec instead of the full path to the spec. This avoids false positives for testing for 'symbian' in the spec name when the path to the spec contains it instead.
| | | | | * | Fix compile on symbian better.Thomas Zander2010-03-222-4/+4
| | | | | | |
| | | | | * | Make ICON generation (to symbian mif) work for relative paths/shadow buildsThomas Zander2010-03-221-0/+2
| | | | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-2312-68/+159
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Wrong repaint when changing the default row height in QTreeView tst_QObject: test signals and slots with the same name Fix warnings in tst_qobject.cpp Optimize QMetaObject::indexOf* functions Add new function QTextLine::horizontalAdvance() Fix warning on Sequential Animation Group build fix for mingw Adding the autotest for the task Fix QGraphicsEffect cache when the item is not visible by the view. Calling setX and setY should send itemSendGeometry/ScenePositionChanged events
| | * | | | | Wrong repaint when changing the default row height in QTreeViewGabriel de Dietrich2010-03-231-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When in QTreeView::dataChanged(), we didn't check for the actual change in the value before setting QTreeViewPrivate::defaultItemHeight. Hence, if uniformRowHeights is true, we completely miss any resizing of the items. Reviewed-by: Thierry Task-number: QTBUG-9216
| | * | | | | tst_QObject: test signals and slots with the same nameOlivier Goffart2010-03-231-2/+40
| | | | | | |
| | * | | | | Fix warnings in tst_qobject.cppOlivier Goffart2010-03-231-17/+19
| | | | | | |
| | * | | | | Optimize QMetaObject::indexOf* functionsOlivier Goffart2010-03-231-31/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comparing the first character before calling strcmp gives big speedup, as it avoid the overhead of calling the strcmp function in many cases. In indexOfMethodRelative, fix the normalize case. The computation of the normalized string was put outside of the for loop, but it should have been inside. This was not detected by the test because the wrong string is at the end. In IndexOfMethodRelative, we do not need to check if the method is a signal or a slot, because we only iterate over the right interval. This is only true for code generated by moc since Qt 4.6. Which means that in application compiled with Qt 4.5 and older, indexOfSignal could now return a slot with the same name (and vice-versa), but I this it is safe to ignore that "problem". Reviewed-by: Roberto Raggi Reviewed-by: Kent Hansen
| | * | | | | Add new function QTextLine::horizontalAdvance()Eskil Abrahamsen Blomfeldt2010-03-233-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a function to QTextLine which returns the accumulated advance of the glyphs in the text. Previously QTextLine::naturalTextWidth() was used for both this purpose and for calculating the pixel width of the text. Since these two metrics are not the same, either of the two usages would be wrong. QTextLine::naturalTextWidth() has been changed to do what its documentation claims it does, and horizontalAdvance() should now be used for laying out text horizontally. Reviewed-by: Simon Hausmann
| | * | | | | Fix warning on Sequential Animation GroupThierry Bastian2010-03-231-6/+1
| | | | | | |
| | * | | | | build fix for mingwThierry Bastian2010-03-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we need to define WIN32_LEAN_AND_MEAN to include both windows.h and winsock2.h (http://msdn.microsoft.com/en-us/library/ms737629(VS.85).aspx)
| | * | | | | Adding the autotest for the taskThierry Bastian2010-03-231-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-2804
| | * | | | | Fix QGraphicsEffect cache when the item is not visible by the view.Alexis Menard2010-03-233-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't rely on the exposed rect since the item can be outside the view so we need to regenerate the complete pixmap. Task-number:QTBUG-8750 Reviewed-by:sroedal
| | * | | | | Calling setX and setY should send itemSendGeometry/ScenePositionChanged eventsAlexis Menard2010-03-232-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SetX and setY were calling setPosHelper directly therefore events for itemSendGeometryChange and itemSendScenePositionChange were not sent properly. Task-number:QTBUG-9093 Reviewed-by:janarve
* | | | | | | Minehunt readme was missing a step.Alan Alpert2010-03-231-0/+2
| | | | | | |
* | | | | | | Make more tests compile on solaris-ccAlan Alpert2010-03-235-19/+19
| | | | | | |
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-23172-3296/+3624
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
| * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Warwick Allison2010-03-232-21/+14
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-232-21/+14
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | / / / / | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: API fixes to QGLBuffer.
| | | * | | | API fixes to QGLBuffer.Rhys Weatherley2010-03-222-21/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use GLuint for bufferId(), not uint. Replace the raw bind() function with a raw release(), because that's the only useful case for being able to do a raw glBindBuffer(). Reviewed-by: Daniel Pope
| * | | | | | Usability improvements for photoviewer demo.Yann Bodson2010-03-235-8/+32
| | | | | | |
| * | | | | | Fix warning.Michael Brasser2010-03-231-1/+1
| | | | | | |
| * | | | | | Changing the alignment property should trigger a repaint.Alexis Menard2010-03-232-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just clear the cache when the property changes. Task-number:QTBUG-8155 Reviewed-by:Yann Bodson
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-2334-1657/+257
| |\ \ \ \ \ \
| | * | | | | | Change default RotationAnimation direction.Michael Brasser2010-03-233-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shortest as default too often led to unintuitive behavior. For example, RotationAnimation { from: 0; to: 360 } will not animate at all. Numerical gives the least surprising results.
| | * | | | | | Add missing NOTIFYs.Michael Brasser2010-03-234-7/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8816