summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.8'Liang Qi2011-09-021-9/+2
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-08-311-9/+2
| |\ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Designer: Fix static linking.
| | * Designer: Fix static linking.Jarek Kobus2011-08-311-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a regression introduced by change e7762b60d519c9ae4b47f6c4ceece584408247ea working around an issue caused by changing the behaviour of qFindChild<> in 99160bb9f851bf02fe5345b5f52217b6c77a57c4. Reviewed-by: Friedemann Kleint <qtc-committer@nokia.com> Task-number: QTBUG-21173
* | | Added an additional check to workaround an issue on Windows.David Boddie2011-09-021-1/+1
|/ / | | | | | | | | | | Reviewed-by: David Boddie Original-patch-by: Friedemann Kleint (cherry picked from commit 8b1654ec6a892e84c1654c9196e80461ee6e92fa)
* | Merge remote branch 'mainline/4.8'Casper van Donderen2011-08-314-61/+10
|\ \ | |/ | | | | | | | | Conflicts: tools/qdoc3/cppcodemarker.cpp tools/qdoc3/node.cpp
| * Merge remote-tracking branch 'upstream/4.8'Sergio Ahumada2011-08-2911-202/+224
| |\ | | | | | | | | | | | | Conflicts: tools/qdoc3/cppcodemarker.cpp
| * \ Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-2633-52/+72
| |\ \
| * | | Disable activeqt on win32-g++ (it doesn't build).Ray Donnelly2011-08-222-2/+2
| | | | | | | | | | | | | | | | | | | | Merge-request: 1336 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | fix warningKonstantin Ritt2011-08-221-1/+1
| | | |
| * | | remove unused functionsOswald Buddenhagen2011-08-222-51/+0
| | | |
* | | | Merge remote branch 'qt-doc-review/master'Casper van Donderen2011-08-3112-188/+185
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc tools/qdoc3/generator.h
| * \ \ \ Merge branch '4.8'Casper van Donderen2011-08-3011-48/+303
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc
| | * | | qdoc3: Updates to qdoc to print error message in ALL CAPSMartin Smith2011-08-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when the path argument for an \example command refers to a directory that does not exist. Task-number: QTBUG-21165
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-08-281-16/+16
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Default graphics memory quota for Symbian applications Fix warning about missing qs60keycapture_p.h header in gui Reimplement MR1271 over coda patch Fixed Symbian memory leak in utcToLocal(QDate &, QTime &) Fix bad merge on a couple of xml examples DEF file freeze
| | * \ \ \ Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-08-2333-60/+83
| | |\ \ \ \
| | * | | | | Reimplement MR1271 over coda patchShane Kearns2011-08-051-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This restores the option to upload files to arbritrary locations. Reviewed-By: mread
| * | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-08-2710-186/+208
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Fixed use of deleted object in XmlPatterns EvaluationCache Crash when creating scroll bar skin graphics on S60 (debug only) QS60Style omits drawing theme background in some Symbian SDKs Fix for qml1shaderplugin GPU resource handling on Symbian Make it easier to select words at the start of a line. Doc: Fixing typo In landscape mode QComboboBox popup can not be showed completely Fix left alignment of native RTL pre-edit text.
| | * | | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-2610-186/+208
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/index.qdoc src/xmlpatterns/expr/qevaluationcache_p.h
| * | \ \ \ \ \ Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-08-253-6/+13
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | / / / | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (21 commits) Revert "Avoid calling QInputMethod update when adding or removing QGraphicsItems that don't have focus" Symbian: Not possible to catch RequestSoftwareInputPanel in eventFilter Fix problem with grabWindow on Mac OS X 10.6 with Cocoa Added an additional check to workaround an issue on Windows. don't crash when destroying children Fix compile issue with Mac OS X 10.5 Avoid calling QInputMethod update when adding or removing QGraphicsItems that don't have focus Exact word bubble doesn't disappear when screen is tapped (fix part 2) Fix QPixmap::grabWindow() on Mac OS X Lion Update 4.7.4 changes Exact word bubble doesn't disappear when screen is tapped Make text rendering working outside the gui thread on Symbian. Doc: Clarified the range of return values from QLineF::angle(). Doc: Fixed \since declarations. Doc: Standardized on QtQuick for \since declarations. Doc: Removed whitespace. Modified \since command behavior slightly to handle project and version. Doc: Added a simple introduction to Qt and fixed links. Doc: Added more appropriate links to help reduce confusion. Doc: Removed non-ASCII characters from the documentation. ...
| | * | | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-233-6/+13
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | Conflicts: doc/src/index.qdoc
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵v4.7.4Qt Continuous Integration System2011-08-231-1/+2
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix problem with grabWindow on Mac OS X 10.6 with Cocoa don't crash when destroying children Fix compile issue with Mac OS X 10.5 Fix QPixmap::grabWindow() on Mac OS X Lion Update 4.7.4 changes
| | | | * | | don't crash when destroying childrenKonstantin Ritt2011-08-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this was uncovered by my don't-detach patch. Reviewed-by: ossi
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-08-221-1/+1
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Added an additional check to workaround an issue on Windows.
| | | | * | | | Added an additional check to workaround an issue on Windows.David Boddie2011-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie Original-patch-by: Friedemann Kleint (cherry picked from commit 8b1654ec6a892e84c1654c9196e80461ee6e92fa)
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-08-189-207/+185
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | / / / | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Doc: Clarified the range of return values from QLineF::angle(). Doc: Fixed \since declarations. Doc: Standardized on QtQuick for \since declarations. Doc: Removed whitespace. Modified \since command behavior slightly to handle project and version. Doc: Added a simple introduction to Qt and fixed links. Doc: Added more appropriate links to help reduce confusion. Doc: Removed non-ASCII characters from the documentation. qdoc: Fixed QTBUG-19338
| | | | * | | Modified \since command behavior slightly to handle project and version.David Boddie2011-06-309-202/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (The since argument can contain a project name and version, defaulting to the qdoc project if only a version number is specified.) Refactored common code into the Generator class. Fixed \sincelist HTML generation for tables containing only one item.
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-06-092-5/+11
| | | | |\ \ \
| | | | | * \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-05-167-10/+15
| | | | | |\ \ \
| | | | | * | | | qdoc: Fixed QTBUG-19338Martin Smith2011-05-162-5/+11
| | | | | | | | |
| | | * | | | | | QTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5Simo Fält2011-06-291-2/+4
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced std::cout with QTextStream Reviewed-by: Eckhart Köppen (cherry picked from commit f078275a2a4b2a279a6fcc24df3c21fe8b21f007)
* | | | | | | | Merge remote branch 'qt-doc-team/4.8'Casper van Donderen2011-08-2910-44/+333
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc tools/qdoc3/ditaxmlgenerator.cpp tools/qdoc3/generator.h tools/qdoc3/htmlgenerator.cpp
| * | | | | | qdoc3: Updates for QTBUG-20776; include fileToOpen path.Martin Smith2011-08-181-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20776
| * | | | | | qdoc3: Updates for QTBUG-20776; clear map between runs.Martin Smith2011-08-181-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20776
| * | | | | | qdoc3: Updates for QTBUG-20739 (no read-only for QML components)Martin Smith2011-08-114-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20739
| * | | | | | qdoc3: Updates for QTBUG-20776 and QTBUG-20777Martin Smith2011-08-103-18/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20776, QTBUG-20777
| * | | | | | qdoc: Check pointer for null before dereferencing.Martin Smith2011-08-031-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20725
| * | | | | | qdoc3: Reverting part of the change for QTBUG-17072Martin Smith2011-08-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17072
| * | | | | | qdoc3: Write "Signal Handlers" instead of "Signals" as headerMartin Smith2011-08-023-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17072
| * | | | | | qdoc: Fixed to remove extranious markup tags.Martin Smith2011-07-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-numberr: QTBUG-20474
| * | | | | | qdoc: Added HTML.nobreadcrumbs as a config variable.Martin Smith2011-07-212-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-numberr: QTBUG-20475
| * | | | | | Phase 1 of QTBUG-20412, the XML manifest fileMartin Smith2011-07-1510-23/+140
| | | | | | |
| * | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-06-172-7/+16
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-06-0924-2621/+4852
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc examples/draganddrop/fridgemagnets/main.cpp examples/script/context2d/main.cpp
* | \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-08-1927-41/+54
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Doc: Fixed qdoc warnings. Doc: Fixed qdoc warnings. Improved comment finding code. Added language information to the pure documentation parser. Doc: Fixes to Qt tutorial Fixed external link to DevNet Wiki. qdoc: Fixed a crash caused by accessing a null pointer. Doc: Fixed the example of an encoded URL in the class description. Doc: Added a copy of the online style images for the qdoc manual. Doc: Removed the Google Analytics script.
| * | | | | | | | | Doc: Fixed qdoc warnings.David Boddie2011-08-152-2/+3
| | | | | | | | | |
| * | | | | | | | | Improved comment finding code.David Boddie2011-08-112-24/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid snippet markers and prevent accidental reuse of comments for different objects.
| * | | | | | | | | Added language information to the pure documentation parser.David Boddie2011-08-112-0/+6
| | | | | | | | | |
| * | | | | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-08-0829-1542/+4687
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | qdoc: Fixed a crash caused by accessing a null pointer.David Boddie2011-07-221-2/+3
| | | | | | | | | |
| * | | | | | | | | Doc: Added a copy of the online style images for the qdoc manual.David Boddie2011-07-2019-0/+0
| | | | | | | | | |
generated by cgit v0.12 at 2025-02-13 04:01:46 (GMT)