summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix regression with SSL connections failing on symbianShane Kearns2010-08-101-1/+1
| | | | | | | | Due to a wrong ifdef sequence, the unix code was being compiled instead of the symbian code for retrieving the system certificates. Task-number: QTBUG-12718 Reviewed-by: Peter Hartmann
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-1024-61/+126
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Pending surface might not get destroyed if no flush() happens Rename Symbian generated mmp/mk files to include target in filename Use ARGB32 premultiplied backing store format in Symbian^3 Register window types for Symbian system effects Added $$MW_LAYER_SYSTEMINCLUDE to some autotests Fix duplicate binary names issues in Symbian autotests Fix some autotest deployments to work in case Qt is already deployed Fix run and runonphone targets for projects that have TARGET with path
| * Pending surface might not get destroyed if no flush() happensJani Hautakangas2010-08-093-16/+9
| | | | | | | | | | | | | | | | in between graphics system change. This patch ensures that all old surfaces are destroyed before new graphics system is activated. Reviewed-by: Jason Barron
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-0922-45/+117
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Rename Symbian generated mmp/mk files to include target in filename Use ARGB32 premultiplied backing store format in Symbian^3 Register window types for Symbian system effects Added $$MW_LAYER_SYSTEMINCLUDE to some autotests Fix duplicate binary names issues in Symbian autotests Fix some autotest deployments to work in case Qt is already deployed Fix run and runonphone targets for projects that have TARGET with path
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-0622-45/+117
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Rename Symbian generated mmp/mk files to include target in filename Use ARGB32 premultiplied backing store format in Symbian^3 Register window types for Symbian system effects Added $$MW_LAYER_SYSTEMINCLUDE to some autotests Fix duplicate binary names issues in Symbian autotests Fix some autotest deployments to work in case Qt is already deployed Fix run and runonphone targets for projects that have TARGET with path
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-0622-45/+117
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Rename Symbian generated mmp/mk files to include target in filename Use ARGB32 premultiplied backing store format in Symbian^3 Register window types for Symbian system effects Added $$MW_LAYER_SYSTEMINCLUDE to some autotests Fix duplicate binary names issues in Symbian autotests Fix some autotest deployments to work in case Qt is already deployed Fix run and runonphone targets for projects that have TARGET with path
| | | | * Rename Symbian generated mmp/mk files to include target in filenameMiikka Heikkinen2010-08-064-27/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mmp and mk files previously contained UID3 as unique identifier in the filename. However, this was not particularly useful for building subprojects in massive project trees such as Qt, as it was difficult to remember UID for each subproject. Now with intuitive naming of mmps, it is possible to build a subproject like this: sbs -c armv6_urel -p qtcore_dll.mmp Task-number: QTBUG-12715 Reviewed-by: Jason Barron
| | | | * Use ARGB32 premultiplied backing store format in Symbian^3Jani Hautakangas2010-08-062-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | raster paint engine for translucent windows. Task-number: QTBUG-12710 Reviewed-by: Jason Barron
| | | | * Register window types for Symbian system effectsJani Hautakangas2010-08-063-1/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the purpose of the window (dialog/popup/child window etc...). Notify WServ when modal window is shown/hidden Notify WServ when temporary surface deallocation happens. Notify WServ when the application is going to shutdown. Task-number: QT-2027 Reviewed-by: Jason Barron
| | | | * Added $$MW_LAYER_SYSTEMINCLUDE to some autotestsMiikka Heikkinen2010-08-063-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These autotests couldn't find e32svr.h in Symbian^3 env because that header has moved. Reviewed-by: TrustMe
| | | | * Fix duplicate binary names issues in Symbian autotestsMiikka Heikkinen2010-08-067-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Symbian each binary name must be unique as all binaries are stored in the same directory on the device. Some autotests created helper binaries that had same names on different tests, which caused build and installation issues when building entire autotest project tree. Reviewed-by: Shane Kearns
| | | | * Fix some autotest deployments to work in case Qt is already deployedMiikka Heikkinen2010-08-063-3/+9
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Shane Kearns
| | | | * Fix run and runonphone targets for projects that have TARGET with pathMiikka Heikkinen2010-08-061-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sis files are always generated in the pro file directory even if TARGET indicates another target directory. Reviewed-by: axis
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-101-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Associate qmlInfo() documentation with QDeclarativeEngine
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-104-41/+84
| |\ \ \ \
| * | | | | Associate qmlInfo() documentation with QDeclarativeEngineMartin Jones2010-08-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12755
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-095-42/+85
|\ \ \ \ \ \ | | |/ / / / | |/| / / / | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: XmlListModel doc fixes Mention QML_IMPORT_TRACE in Modules docs Merge sections about when property and default state Explain Flipable example further PathView required some diagonal movement before a drag was initiated.
| * | | | XmlListModel doc fixesBea Lam2010-08-091-1/+7
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12749
| * | | | Mention QML_IMPORT_TRACE in Modules docsBea Lam2010-08-091-0/+8
| | | | |
| * | | | Merge sections about when property and default stateBea Lam2010-08-091-36/+59
| | | | |
| * | | | Explain Flipable example furtherBea Lam2010-08-091-4/+10
| |/ / /
| * | | PathView required some diagonal movement before a drag was initiated.Martin Jones2010-08-091-1/+1
|/ / / | | | | | | | | | | | | | | | | | | Any movement beyond the threshold is sufficient. Task-number: 12747 Reviewed-by: Joona Petrell
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-0681-3118/+6846
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (34 commits) Modified descriptions of QBasicTimer class and isActive() function. Translation work for 4.7 Some more french translations. Some french translations doc: Re-introduced next/previous page links in the footer. Doc: Fixing validation bugs Removed duplicate case for const variable snippet. doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. doc: Fixed some S60 qdoc errors. doc: Fixed some missing images. Adding Getting Started files. Auto test passes. Changed width of the document. Part of the fix for QTBUG-12180 Revert "Doc: Adding GS QML example files" Update def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4. Remove useless QString::clear() from QSharedData example snippet. Move note on connectToBus() not actually being able to reconnect to Adding a description for the Spectrum Analyzer demo. For QTBUG-12180 qdoc: added application flags in doc.pri and fixed QTBUG-12388 ...
| * | Modified descriptions of QBasicTimer class and isActive() function.Jerome Pasion2010-08-061-3/+4
| | | | | | | | | | | | | | | Reviewed by: David Boddie Task: QTBUG-12313
| * | Translation work for 4.7Pierre Rossi2010-08-067-514/+3003
| | | | | | | | | | | | | | | | | | | | | | | | validating and adding some french translations. Plus all the fixes from Gabriel's extensive review. Doc: Fix a typo Reviewed-by: gabi
| * | Some more french translations.qCaro2010-08-061-151/+156
| | | | | | | | | | | | Reviewed-by: Pierre
| * | Some french translationsPierre Rossi2010-08-066-3071/+2549
| | | | | | | | | | | | Reviewed-by: gabi
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-062-9/+5
| |\ \
| | * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-0672-1526/+2168
| | |\ \
| | | * | Removed duplicate case for const variable snippet.Jerome Pasion2010-08-061-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewer: David Boddie Task number: QTBUG-10411
| | * | | Doc: Fixing validation bugsMorten Engvoldsen2010-08-061-4/+5
| | | | |
| * | | | 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>
| * | | | 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
generated by cgit v0.12 at 2025-01-24 20:16:17 (GMT)