summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-09-14313-10174/+18486
|\ | | | | | | | | | | Conflicts: src/gui/text/qtextengine_p.h src/network/ssl/qsslsocket_openssl.cpp
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-09-101-2/+8
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Disable autotest broken by the change to QCache in 7ab0bed Generate glyphs in un-transformed coordinate system. Use QT_MAX_CACHED_GLYPH_SIZE in QFontEngineFT Reset trailingSpaces in relayout Prevent QPixmapCache potentially growing indefinitely. Allocate 16-byte aligned memory independent of platform for raster pool. Fix trailing spaces problem by not adding it to QScriptLine.length Fix RTL layout for fonts when non-printable character has an advance Fix regression in tst_qrawfont Make it compile on mac Fixed compiling error in qvfb. micro optimizations fix "comparison between signed and unsigned" warnings on windows, don't resolve the gdi32's symbols for each QRawFont instance fix typo in the docs QRawFont: add missed operator != optimize QGlyphRun's operator == a bit QGlyphRun: make operator != inlined QGlyphRun: don't detach if the decoration wasn't actually changed QPA event loop: Set a timeout != 0 if there are no timers.
| | * Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-09-0820-313/+499
| | |\ | | | | | | | | | | | | | | | | Conflicts: tools/qvfb/qvfbshmem.cpp
| | * | Fixed compiling error in qvfb.luohua2011-09-022-2/+9
| | | | | | | | | | | | | | | | | | | | Merge-request: 1324 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-09-082-12/+16
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Split CFLAGS from pkg-config properly Ensure that the proxystyle is used over the style's own functions runonphone: Add a missing space between a message and the file name Perl check for windows configure. QSettings: don't assume XDG_CONFIG_HOME is latin1-encoded QSettings: use the common appdata dir when bootstrapping qmake on win Replace explicit surrogate handlers by inline methods of QChar class
| | * | runonphone: Add a missing space between a message and the file nameMartin Storsjo2011-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | Merge-request: 2670 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | Perl check for windows configure.Markku Heikkila2011-09-071-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Works for Windows, *nix check is done by bash shell. Task-number: QTBUG-5710 Merge-request: 1362 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-09-072-2/+13
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix build for desktop Fix the build with -qtnamespace configure options
| | * | fix build for desktopKonstantin Ritt2011-09-072-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG: 20236 Merge-request: 2672 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-09-051-1/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Removed the unnecessary dependency of the QtHelp module on the QtXml one
| | * | Removed the unnecessary dependency of the QtHelp module on the QtXml oneConstantin Makshin2011-09-051-1/+0
| | | | | | | | | | | | | | | | | | | | Merge-request: 2669 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Liang Qi2011-09-033-39/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/htmlgenerator.cpp
| | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-09-039-202/+168
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Modified \since command behavior slightly to handle project and version.
| | | * | | Modified \since command behavior slightly to handle project and version.David Boddie2011-09-029-202/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (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. (cherry picked from commit 6a2f18140bbc41207eb2f5e2323b699600d89606) Reapplied after bad v4.7.4 merge
| | | * | | Merge remote-tracking branch 'origin/4.8'Liang Qi2011-09-021-9/+2
| | | |\ \ \
| | * | \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-09-021-1/+7
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Update license headers Silently ignore a wrong parameter count instead of crashing Introducing --address <bus> parameter to qdbus Introduce menubar plugin system Introduce QAbstractPlatformMenuBar Hide Q<Platform>MenuAction Fix warning about initialization order
| | | * \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-08-3113-93/+299
| | | |\ \ \ \ \
| | | * | | | | | Silently ignore a wrong parameter count instead of crashingPeter Grasch2011-08-311-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1363 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
| | | * | | | | | Introducing --address <bus> parameter to qdbusPeter Grasch2011-08-311-1/+6
| | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1363 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-09-021-1/+1
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | / / | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | master-integration * 'master' 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-09-021-1/+1
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie Original-patch-by: Friedemann Kleint (cherry picked from commit 8b1654ec6a892e84c1654c9196e80461ee6e92fa)
| * | | | | Merge branch 4.8 into qt-4.8-from-4.7Sergio Ahumada2011-09-0111-47/+329
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/ditaxmlgenerator.cpp tools/qdoc3/htmlgenerator.cpp
| | * | | | 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
| | * | | Merge remote branch 'mainline/4.8'Casper van Donderen2011-08-314-61/+10
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/cppcodemarker.cpp tools/qdoc3/node.cpp
| | * | | 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 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 remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7Sergio Ahumada2011-08-3136-115/+77
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: src/network/ssl/qsslcertificate.cpp
| | * | | | | | Merge remote-tracking branch 'upstream/4.8'Sergio Ahumada2011-08-2911-202/+224
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/cppcodemarker.cpp
| | | * | | | | 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 remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-2633-52/+72
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | 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 '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.
generated by cgit v0.12 at 2025-01-16 22:32:30 (GMT)