summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-09-261-2/+18
|\ | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix broken qglthreads autotest build on Solaris. Don't store the alignment attribute for spacers
| * Don't store the alignment attribute for spacersJarek Kobus2011-09-231-2/+18
| | | | | | | | | | | | | | | | And for QLayoutWidget as it is not allowed and will create a code which doesn't compile Reviewed-by: con <qtc-committer@nokia.com> Task-number: QTBUG-21575
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-09-207-5/+181
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: (31 commits) runonphone: Include USB serial ports on OS X for CODA, too runonphone: Implement traceswitch support for coda Fix missing clean up stack panic for a new thread in Symbian Regression in QS60Style when drawing webview scrollbars Cleanup qwidget_s60.cpp Fix panic when global QSettings instance needs flusing at app exit Fix uninitialised variable in temporary files More accurately determine bearer type for symbian GPRS/3G Add documentation for Symbian QSettings locations and security Update QDesktopServices openUrl() documentation on Symbian OS Mark binaries as SMPSAFE in Symbian Fix "sbs -c tools2 --what" output for Qt. Update environment.prf QS60Style: Make spinboxes and lineedits slightly taller runonphone: Add a missing space between a message and the file name runonphone: Allow overriding the temporary sis file name Fix QIcon auto-tests for Symbian Add a cast to moc cpp generator to remove armcc warnings Fix qt.conf for Symbian to use $${EPOCROOT} Remove few unused variables. ...
| * | runonphone: Include USB serial ports on OS X for CODA, tooMartin Storsjo2011-09-191-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | The actual devices are already detected in serenum_unix.cpp, but when used with CODA, the eligible /dev entries apparently need to be listed here, too. Reviewed-By: Shane Kearns Merge-Request: 1373
| * | runonphone: Implement traceswitch support for codaShane Kearns2011-09-165-3/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The traceswitch application redirects debug messages to the USB port. This was supported by the TRK backend but not by the CODA backend. 1. CODA backend now recognises mux channel 2 as valid 2. new TextTraceHandler class to attach to channel 2 and decode trace packets / print them to stdout 3. CODA signal handler creates a TextTraceHandler & destroys it on shutdown Reviewed-By: Miikka Heikkinen
| * | runonphone: Add a missing space between a message and the file nameMartin Storsjo2011-09-071-1/+1
| | | | | | | | | | | | | | | Merge-request: 2670 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| * | runonphone: Allow overriding the temporary sis file nameMartin Storsjo2011-09-071-2/+6
| | | | | | | | | | | | | | | Merge-request: 1300 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-09-161-9/+9
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: StrictlyEnforceRange with snapOneItem/Row and header behavior change Release font engine refcount when done using it in QTextEngine Migrate addMarkUp function to QChar. update the proxy info before session is opened in QNAM by Aapo Makela QSslCertificate: block all DigiNotar (intermediate and root) certs QSslCertificate: also check common name for blacklisted certificates Fix typo in header guard. fix doc typo Ensure that the corewlan plugin can be built with the Mac OS X 10.7 sdk remove obsolete define Fix assert error on Windows with a negative char. Doc: Fixed the example of an encoded URL in the class description. Added an additional check to workaround an issue on Windows.
| * | 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
| * | | Migrate addMarkUp function to QChar.Casper van Donderen2011-09-081-9/+9
| | | | | | | | | | | | | | | | Reviewed-by: Martin Smith
| * | | Fix assert error on Windows with a negative char.Casper van Donderen2011-09-021-4/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Denis Dzyubenko Fixes: QTBUG-20228
* | | | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-09-1515-249/+490
|\ \ \ \ | | |/ / | |/| |
| * | | 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
| * | | | 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
| * \ \ \ \ 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
| * \ \ \ \ \ 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.
| | * | | | | | | 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 branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-3110-208/+186
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/index.qdoc
| | * | | | | | | | | | | Added an additional check to workaround an issue on Windows.David Boddie2011-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie Original-patch-by: Friedemann Kleint (cherry picked from commit 8b1654ec6a892e84c1654c9196e80461ee6e92fa) (cherry picked from commit d62bb74d329b6ee5f6c52ac26e11bfe9a27f56a0) Reapplied after bad v4.7.4 merge
generated by cgit v0.12 at 2024-11-27 01:45:41 (GMT)