summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: correcting merge errorMorten Engvoldsen2011-01-121-4/+9
|
* Adding a link to the coding style wiki page.Jerome Pasion2011-01-071-0/+5
|
* Doc: Sync with upstream.David Boddie2010-12-221-1/+1
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-216-15/+9
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-216-44/+44
| |\
| * | Doc: Changed a page title.David Boddie2010-12-215-6/+6
| | |
| * | Doc: Updated the HarfBuzz license information.David Boddie2010-12-211-9/+3
| | | | | | | | | | | | As-requested-by: Legal
* | | Doc: Fixed QML syntax in quoted code snippets.David Boddie2010-12-214-24/+67
| | |
* | | Merge branch 'qdoc-simplified' into 4.7David Boddie2010-12-2110-25/+39
|\ \ \ | |_|/ |/| |
| * | Enabled error reporting and a plain text fallback for invalid QML.David Boddie2010-12-2110-25/+39
| | | | | | | | | | | | | | | The location of places where code is included in documentation is now passed into each code marker when highlighted code is needed.
* | | Merge branch 'qdoc-simplified' into 4.7David Boddie2010-12-216-44/+44
|\ \ \ | |/ / | | / | |/ |/|
| * Doc: Updated the Qt version number.David Boddie2010-12-211-4/+4
| |
| * Doc: Fixed whitespace.David Boddie2010-12-213-11/+11
| |
| * Doc: Fixed whitespace.David Boddie2010-12-212-29/+29
| |
* | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-2013-14/+101
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-2011-13/+97
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Setting TextInput.cursorPosition outside bounds crashed. Update test bitmaps for QDeclarativeImage::svg() autotest on Windows Don't truncate image:// url strings prematurely Update docs on importing javascript files
| | * | Setting TextInput.cursorPosition outside bounds crashed.Martin Jones2010-12-204-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Check bounds in TextInput and TextEdit. Task-number: QTBUG-16188 Reviewed-by: Bea Lam
| | * | Update test bitmaps for QDeclarativeImage::svg() autotest on WindowsJoona Petrell2010-12-202-0/+0
| | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| | * | Don't truncate image:// url strings prematurelyBea Lam2010-12-203-12/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Url fragments and queries were being removed from the image ids passed to QDeclarativeImageProvider. Task-number: QTBUG-16195 Reviewed-by: Martin Jones
| | * | Update docs on importing javascript filesBea Lam2010-12-202-1/+5
| |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-201-1/+1
| |\ \ | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix deployment of minehunt for Symbian
| | * | Fix deployment of minehunt for SymbianDamian Jansen2010-12-201-1/+1
| | | | | | | | | | | | | | | | Task: QT-4298
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-201-0/+3
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Quiet unused parameter warnings.
| | * | Quiet unused parameter warnings.Aaron McCarthy2010-12-201-0/+3
| |/ /
* | | Merge branch 'qdoc-simplified' into 4.7David Boddie2010-12-202-30/+27
|\ \ \ | | |/ | |/|
| * | Fixed handling of indented snippet markers.David Boddie2010-12-202-30/+27
| | | | | | | | | | | | Refactored the code to remove namespace macros and snippet markers.
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-2033-83/+229
|\ \ \ | |/ / |/| |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-12-2013-20/+32
| |\ \
| | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-182-2/+9
| | |\ \ | | | |/
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-12-181-1/+7
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Use relative include instead of absolute in default qmake.conf
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-12-181-1/+7
| | | | |\ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Use relative include instead of absolute in default qmake.conf
| | | | * Use relative include instead of absolute in default qmake.confMiikka Heikkinen2010-12-171-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Absolute include path breaks QtP releases which copy mkspecs under epoc32 and do not necessarily have the sources available in the original absolute path and can't patch the paths either at installation time. Task-number: QTBUG-16172 Reviewed-by: Oswald Buddenhagen
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-171-1/+2
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix waitForOpened not working with already active configuration
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Ville Pernu2010-12-1712-36/+120
| | | | |\ \
| | | | * | | Fix waitForOpened not working with already active configurationVille Pernu2010-12-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an active QNetworkConfiguration is already in use (e.g. browser already open), the QNetworkSession::waitForOpened() did not work properly. Changed one if-statement in the function to adapt to the scenario. Reviewed-by: Perttu Pohjonen Task-number: QTBUG-565
| | * | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-1711-18/+23
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-175-12/+10
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix QDeclarativeState::reset() autotest Update test bitmaps for QDeclarativeImage::svg() autotest on Linux
| | | | * | | Fix QDeclarativeState::reset() autotestJoona Petrell2010-12-173-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current state reset mechanism does not really work for Text elements as the keeping implicit correct would require relayouting of text twice (See bug QTBUG-15118). Changed QDeclarativeState reset autotest to use Image element instead of Text element until the issue has been fixed. Task-number: Reviewed-by: Yann Bodson
| | | | * | | Update test bitmaps for QDeclarativeImage::svg() autotest on LinuxJoona Petrell2010-12-172-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-12-171-4/+4
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix incorrect file name case for OpenGL libraries in symbian.conf.
| | | | * | | | Fix incorrect file name case for OpenGL libraries in symbian.conf.Miikka Heikkinen2010-12-171-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To support linux builds, file names must be cased correctly. Task-number: QT-4375 Reviewed-by: Miikka Heikkinen
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-174-1/+8
| | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add work around for bug when painting w/glTexSubImage into large texture
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-164-1/+8
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add work around for bug when painting w/glTexSubImage into large texture
| | | | | * | | | Add work around for bug when painting w/glTexSubImage into large textureEskil Abrahamsen Blomfeldt2010-12-164-1/+8
| | | | | | |_|/ | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that copying small rectangles from glTexSubImage2D into a texture which is 2048x2048 is busted on some SGX drivers, even though the driver reports 2048 as the maximum texture size. This caused text to turn into flickering garbage once the texture glyph cache had grown to its max size (e.g. when painting very many Chinese glyphs.) To work around the problem, we hardcore the maximum texture height to 1024 on this driver so that the texture glyph cache is reset whenever that size is exceeded. Task-number: QT-3971 Done-with: Samuel
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-171-1/+1
| | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: typo fixed in doc/src/declarative/extending.qdoc
| | | | * | | | Doc: typo fixed in doc/src/declarative/extending.qdocJoerg Bornemann2010-12-161-1/+1
| | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | | | Added BSD license to snippet code.Jerome Pasion2010-12-201-0/+39
| |/ / / / /
| * | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-1619-63/+158
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-161-1/+4
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: QmlDebugger: Fix runtime warnings about unregistered metatypes
| | | * | | QmlDebugger: Fix runtime warnings about unregistered metatypesKai Koehne2010-12-161-1/+4
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check whether the type of a property is known to the metatype system before trying to read from it. That avoids lots of runtime warnings e.g. for the QSequentialGroup::currentAnimation property, which type QAbstractAnimation * isn't registered by default via qRegisterMetaType<>(). Reviewed-by: Christiaan Janssen Task-number: QTCREATORBUG-2853
generated by cgit v0.12 at 2025-01-08 18:38:46 (GMT)