summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* doc: Re-introduced next/previous page links in the footer.Martin Smith2010-08-061-0/+55
| | | | Task-Nr: QTBUG-12278
* doc: Fixed some qdoc errors.Martin Smith2010-08-061-2/+3
|
* doc: Fixed some qdoc errors.Martin Smith2010-08-062-30/+20
|
* doc: Fixed some qdoc errors.Martin Smith2010-08-062-0/+33
|
* doc: Fixed some S60 qdoc errors.Martin Smith2010-08-062-0/+54
|
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-0621-0/+1638
|\
| * Adding Getting Started files. Auto test passes.Jerome Pasion2010-08-0620-0/+1603
| |
| * Changed width of the document. Part of the fix for QTBUG-12180Jerome Pasion2010-08-061-7/+3
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Jerome Pasion2010-08-0658-1843/+775
| |\
| * | Adding a description for the Spectrum Analyzer demo. For QTBUG-12180Jerome Pasion2010-08-051-0/+39
| | | | | | | | | | | | Reviewed by: David Boddie
* | | doc: Fixed some missing images.Martin Smith2010-08-062-3/+1
| |/ |/| | | | | Task-nr: QTBUG-8246
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-0656-1838/+767
|\ \
| * | Revert "Doc: Adding GS QML example files"Alan Alpert2010-08-0621-1617/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f13ebf52a0d091c6c72c97d2a13311e1e7c4a5cf. The given example does not meet the autotest requirements for QML examples. These involve that it starts without error messages, and that it follows our naming convention of the start file starting with a lowercase letter. Please run the tests/auto/declarative/examples before pushing new declarative examples. If new examples should be exempted from these checks, add them to the list of exceptions in that autotest.
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-0661-174/+1778
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4. Remove useless QString::clear() from QSharedData example snippet. Move note on connectToBus() not actually being able to reconnect to Designer: Prevent rich text from being copied into style sheets. QXmlPatterns QAbstractDateTime: only parse 3 digits of time fraction qdoc: Removed three unused config variables. qdoc: Cleaned up the application option specification and use. Doc: Adding GS QML example files Doc: Images for QML GS Doc: Editied version of QML GS Doc: Adding text to GS page Fix link error when building Bearer application with Qt Mobility Doc: nesting up orphant pages
| | * | Update def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4.Aaron McCarthy2010-08-061-1/+1
| | | |
| | * | Remove useless QString::clear() from QSharedData example snippet.Robin Burchell2010-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | Merge-request: 2443 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | Move note on connectToBus() not actually being able to reconnect toRobin Burchell2010-08-051-4/+3
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | connectToBus() documentation, where it belongs. This also fixes some bad English ("make be connected") by means of removing it. Merge-request: 2443 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-056-100/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove the memory tracking attempt from the runtime graphics system.
| | * | Remove the memory tracking attempt from the runtime graphics system.Jason Barron2010-08-056-100/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has been decided that this logic will not be used by anyone at the moment so let's remove it. This removes an exported (although private) virtual function so breaks binary compatiblity for plugins built with previous versions. Reviewed-by: Jani Hautakangas
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-0530-325/+963
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Rename example component file for clarity Improve docs on QML Animation page and associated elements Fix warning from whining complier. Re-enable script program caching on Symbian (used to be disabled due to crash problems that no longer occur). Increase drag distance on Symbian to improve finger usability on capacitive screens Increase maximum heap size of QML Viewer Add missing test file. Make sure onFocusChanged is correctly emitted for items in a FocusScope.
| | * | | Rename example component file for clarityBea Lam2010-08-054-8/+22
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12633
| | * | | Improve docs on QML Animation page and associated elementsBea Lam2010-08-0518-298/+843
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12666
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-057-18/+97
| | |\ \ \
| | | * | | Re-enable script program caching on Symbian (used to be disabled due to ↵Joona Petrell2010-08-051-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crash problems that no longer occur). Task-number: QTBUG-12599 Reviewed-by: Martin Jones
| | | * | | Increase drag distance on Symbian to improve finger usability on capacitive ↵Joona Petrell2010-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screens Task-number: QTBUG-12594 Reviewed-by: Martin Jones
| | | * | | Increase maximum heap size of QML ViewerJoona Petrell2010-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12029 Reviewed-by: Martin Jones
| | | * | | Add missing test file.Michael Brasser2010-08-051-0/+33
| | | | | |
| | | * | | Make sure onFocusChanged is correctly emitted for items in a FocusScope.Michael Brasser2010-08-053-12/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12649 Reviewed-by: Martin Jones
| | * | | | Fix warning from whining complier.Martin Jones2010-08-051-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12473 Reviewed-by: Aaron Kennedy
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-08-051-1/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed incorrect include/Qt/qconfig.h in binary packages.
| | * | | | Fixed incorrect include/Qt/qconfig.h in binary packages.Rohan McGovern2010-08-051-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building from a source package, src/corelib/global/qconfig.h exists. syncqt contained logic to force the creation of include/Qt/qconfig.h for the case where it _doesn't_ exist. This meant that running syncqt from a Qt source package resulted in include/Qt/qconfig.h including qconfig.h twice. Task: QTBUG-12637 Reviewed-by: Toby Tomkins
* | | | | | qdoc: added application flags in doc.pri and fixed QTBUG-12388Martin Smith2010-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-nr: QTBUG-12388
* | | | | | qdoc: added application flags in doc.pri and fixed QTBUG-12388Martin Smith2010-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-nr: QTBUG-12388
* | | | | | qdoc: added application flags in doc.pri and fixed QTBUG-12388Martin Smith2010-08-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-nr: QTBUG-12388
* | | | | | qdoc: added application flags in doc.pri and fixed QTBUG-12388Martin Smith2010-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-nr: QTBUG-12388
* | | | | | qdoc: added application flags in doc.pri and fixed QTBUG-12388Martin Smith2010-08-052-5/+7
| |_|_|_|/ |/| | | | | | | | | | | | | | Task-nr: QTBUG-12388
* | | | | Designer: Prevent rich text from being copied into style sheets.Friedemann Kleint2010-08-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Lasse Holmstedt <lasse.holmstedt@nokia.com> Task-number: QTCREATORBUG-1952
* | | | | QXmlPatterns QAbstractDateTime: only parse 3 digits of time fractionPeter Hartmann2010-08-054-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the XML Schema dateTime type allows for an unlimited precision of fractial time values; this fails for 4 or more digits when creating a QTime. This patch takes only 3 digits of the time fraction into account, since we cannot store more in a QTime or QDateTime anyway. Reviewed-by: Olivier Goffart Task-number: QTBUG-11559
* | | | | qdoc: Removed three unused config variables.Martin Smith2010-08-058-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These no longer do anything in qdocconf files: online = false offline = false creator = true
* | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-0537-27/+1653
|\ \ \ \ \
| * | | | | Doc: Adding GS QML example filesMorten Engvoldsen2010-08-0521-0/+1617
| | | | | |
| * | | | | Doc: Images for QML GSMorten Engvoldsen2010-08-0512-0/+0
| | | | | |
| * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-055-1/+12
| |\ \ \ \ \
| | * | | | | Fix link error when building Bearer application with Qt MobilityAlex2010-08-052-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtMobility uses the Qt header when compiling applications which link against Mobility's Bearer library. Therefore QNetworkConfiguration::bearerName() cannot be inline and refer to the new QNetworkConfiguration::bearerTypeName() function (which doesn't exist in Mobility) Task-number: QTBUG-12378 Reviewed-by: Rohan McGovern
| * | | | | | Doc: Editied version of QML GSMorten Engvoldsen2010-08-051-25/+21
| | | | | | |
| * | | | | | Doc: Adding text to GS pageMorten Engvoldsen2010-08-051-1/+7
| | |/ / / / | |/| | | |
* | | | | | qdoc: Cleaned up the application option specification and use.Martin Smith2010-08-055-116/+95
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The flags allowed on the command line are now: -online (default), -base, -assistant (same as -base), and -creator. If you don't specify one of these, you see a warning in the error output telling you that it didn't find an application flag and that it generated online docs by defualt.
* | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-0574-930/+3152
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-051-0/+1
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: dont leak these
| | * | | dont leak theseLorn Potter2010-08-051-0/+1
| | |/ /