summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Set QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH to default valueAdrian Constantin2010-07-071-3/+0
| | | | | | Remove workaround introduced in Qt 4.6 as not needed any more Reviewed-by: Adrian Constantin
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-0725-232/+164
|\
| * Simplify *= to += after contains() testMark Brand2010-07-078-14/+14
| | | | | | | | | | Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Consolidate sql driver configuration redundancyMark Brand2010-07-0720-221/+126
| | | | | | | | | | | | | | | | | | | | | | Previously sql driver recipes each appeared in both the plugin pro file and src/sql/drivers/drivers.pri for building into QtSql. Split driver recipes into shared pri files. Also split bundled 3rd party sqlite code recipe into a shared pri. Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Fixed whitespace formattingMark Brand2010-07-079-9/+9
| | | | | | | | | | Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * run dep commands in build dirOswald Buddenhagen2010-07-075-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the file names are given relative to the build directory, so the command needs to be run in it as well. this is a more expected (and simpler) fix than the alternative, which would be giving file names relative to the source directory. reasons not to fix: - due to some other bug, the problem really affects only builds where the build dir is not at the same level as the source dir - otherwise, absolute paths would be passed anyway - it has some breakage potential for the cases where the commands actually expect being run in the source dir - it can be worked around by manually injecting the cd statement into the command reasons why i still fixed it: - it doesn't affect in-source builds, and it seems that most complex build systems (which would define custom compilers with depend_command) don't support shadow builds anyway - people who needed things to work probably already used $$OUT_PWD somehow (either a "cd" at the start, or prepending it to each path), so this change will be practically a no-op - "it's just dependencies, and these are known to be broken in qmake anyway" Reviewed-by: joerg Task-number: QTBUG-1918
* | qdoc: Fixed a few links to QtObject (QML:QtObject)Martin Smith2010-07-075-20/+14
|/
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-074-2/+83
|\
| * Add missing API shimsKent Hansen2010-07-073-0/+39
| | | | | | | | | | | | | | | | There were still a couple of functions that didn't have them. This could cause said functions to crash if multiple script engines were being used. Reviewed-by: Jedrzej Nowacki
| * I18n: Complete German translation for 4.7.0Friedemann Kleint2010-07-071-2/+44
| |
* | qdoc: Removed a lot of dead code to minimize confusion.Martin Smith2010-07-072-234/+1
|/
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-0717-107/+407
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-0616-463/+299
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix autotest Adapt the TapAndHold recognizer to non-touch too add setNativeArguments() and nativeArguments() fix bogus return value from qprocess::execute() qdoc: Simplified code to enable fixing of QTBUG-6340. Doc: fixing img style
| | * fix autotestOswald Buddenhagen2010-07-061-0/+5
| | | | | | | | | | | | | | | fixing QProcess::execute() revealed that this test has always been broken on windows.
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-0615-463/+294
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Adapt the TapAndHold recognizer to non-touch too add setNativeArguments() and nativeArguments() fix bogus return value from qprocess::execute() qdoc: Simplified code to enable fixing of QTBUG-6340. Doc: fixing img style
| | | * Adapt the TapAndHold recognizer to non-touch tooThomas Zander2010-07-061-23/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QTapAndHoldGestureRecognizer now can trigger also on mouse and GraphicsSceneMouse events and all of them will cause the gesture start event to be sent after the touch interval timed out. Reviewed-by: Denis
| | | * add setNativeArguments() and nativeArguments()Oswald Buddenhagen2010-07-069-8/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this function enables starting subprocesses which need command lines which cannot be constructed via the portable list-based api. such cases would be programs which need quoting rules which diverge from the msvc runtime. Reviewed-by: joerg Task-number: QTBUG-7620 (and various others which boil down to that)
| | | * fix bogus return value from qprocess::execute()Oswald Buddenhagen2010-07-062-4/+19
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-230, QTBUG-5866 Reviewed-by: joerg
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-063-1/+199
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Support QSslSocket::systemCaCertificates() on Symbian
| | * | Support QSslSocket::systemCaCertificates() on SymbianSimon Hausmann2010-07-063-1/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented access to the unified certificate store on Symbian with Shane and Peter's help. Task-number: QTBUG-11399 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-063-71/+15
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Spectrum demo: fixed installation Spectrum build: fixed DLL rpath
| | * | Spectrum demo: fixed installationGareth Stockwell2010-07-062-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All binaries must be written into $$QT_BUILD_DIR/demos/spectrum in order for them to be correctly installed. Task-number: QTBUG-11572 Task-number: QTBUG-11756 Reviewed-by: Andy Shaw
| | * | Spectrum build: fixed DLL rpathGareth Stockwell2010-07-062-60/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than explicitly modifying LD_LIBRARY_PATH using a shell script when the application is launched, the relative path from the application binary to the FFT library is encoded in the application using an --rpath flag. Task-number: QTBUG-11756 Reviewed-by: Andy Shaw
* | | qdoc: Fixed the case where the property and type names are the same.Martin Smith2010-07-0714-50/+61
| |/ |/| | | | | | | | | Also simplified some code. Task-number: QTBUG-6340
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-068-24/+123
|\ \
| * | Doc: fixing img styleMorten Engvoldsen2010-07-061-2/+9
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-054-4/+41
| |\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Support time zone designator in QDateTime::fromString() based on ISO 8601-2004 standard.
| | * Support time zone designator in QDateTime::fromString() based on ISO ↵Liang Qi2010-07-054-4/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | 8601-2004 standard. Task-number: QTBUG-11623 Reviewed-by: Denis Dzyubenko Reviewed-by: David Boddie
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-0511-36/+161
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Set the registration time while using the collection generator to register. Network: Optimize HTTP proxy lookup on Windows qdoc: Added explanation of autmatically generated signal hanlers. QSslSocket::systemCaCertificates(): fix for WinCE Doc: fixing search script and style qdoc: Fixed type linking for QML properties (most of them).
| | * | Set the registration time while using the collection generator to register.kh12010-07-051-0/+2
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11911 Reviewed-by: ck
| | * | Network: Optimize HTTP proxy lookup on WindowsMarkus Goetz2010-07-051-5/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Only try auto config retrieval once. Patch by Kai Koehne. Task-number: QTBUG-10106
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-051-13/+39
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Revert "Character spacing when drawing a QPicture to a high DPI device."
| | * | Revert "Character spacing when drawing a QPicture to a high DPI device."Trond Kjernåsen2010-07-051-13/+39
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d0fb8557f3fc3e7c9305662d118228ceca9df72b. This change breaks justified text drawing in QPrintPreview, so it's reverted for now.
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-053-7/+16
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Warn when drawPixmapFragments is called with an invalid source rect Fix build failure with cs2009q3 toolchain.
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-0448-486/+591
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: make image handler includes private fix symbian build doc improvements rebuild configure s/INCPATH/INCLUDEPATH/ Fix Windows build Consolidate zlib configuration redundancy Fixed whitespace formatting Fix incomplete support for built-in jpeg, mng, tiff and gif handlers Split image handler plugin project files No explicit link to zlib/jpeg for system mng/tiff Removed stray line continuations Long live else! qdoc: Added a solution for creating tables of contents for manuals. Doc: Fixed markup. Fixed size hint for combo box on windows
* | | | | qdoc: Simplified code to enable fixing of QTBUG-6340.Martin Smith2010-07-064-426/+97
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | Also reworded some of the text for QTBUG-11575. Task-number: QTBUG-6340, QTBUG-11575
* | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-055-15/+61
|\ \ \ \
| * | | | QSslSocket::systemCaCertificates(): fix for WinCEPeter Hartmann2010-07-052-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on WinCE the function is called "CertOpenStore", and not "CertOpenSystemStoreW". Patch-by: Ismail Donmez Task-number: QTBUG-11905
| * | | | Doc: fixing search script and styleMorten Engvoldsen2010-07-053-15/+43
| | | | |
* | | | | qdoc: Added explanation of autmatically generated signal hanlers.Martin Smith2010-07-051-12/+58
|/ / / / | | | | | | | | | | | | Task-number: QTBUG-11575
* | | | qdoc: Fixed type linking for QML properties (most of them).Martin Smith2010-07-053-4/+8
| |_|/ |/| | | | | | | | Task-number: QTBUG-6340
* | | Warn when drawPixmapFragments is called with an invalid source rectAndy Shaw2010-07-051-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When drawPixmapFragments() is called with fragments that has invalid source rects in it, then usually it causes the pixmap drawn on screen to appear corrupted. However it has been reported that a crash can occur (not reproducable locally) so by adding a warning in debug mode only means that this can hopefully be caught at development time. Reviewed-by: Trond
* | | Fix build failure with cs2009q3 toolchain.Aaron McCarthy2010-07-052-7/+7
| |/ |/| | | | | Use Qt typedef for unsigned 32-bit integers.
* | make image handler includes privateOswald Buddenhagen2010-07-0418-32/+32
| | | | | | | | | | now that they live in gui/image/ instead of plugins/imageformats/, the handlers need to get the usual _p suffix.
* | fix symbian buildOswald Buddenhagen2010-07-031-2/+2
| | | | | | | | | | as absolutely braindead as it is, symbian is a unix as far as qmake is concerned.
* | doc improvementsOswald Buddenhagen2010-07-031-5/+4
| |
* | rebuild configureOswald Buddenhagen2010-07-031-0/+0
| |
* | s/INCPATH/INCLUDEPATH/Oswald Buddenhagen2010-07-031-1/+2
| |
* | Fix Windows buildMark Brand2010-07-031-4/+4
| | | | | | | | | | | | | | | | Set the QT_NO_IMAGEFORMAT_* defines like the unix configure does. This avoids that we try to link the image handlers into QtGui when they are built as plugins. Reviewed-by: ossi
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-0341-456/+561
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Consolidate zlib configuration redundancy Fixed whitespace formatting Fix incomplete support for built-in jpeg, mng, tiff and gif handlers Split image handler plugin project files No explicit link to zlib/jpeg for system mng/tiff Removed stray line continuations Long live else! qdoc: Added a solution for creating tables of contents for manuals. Doc: Fixed markup. Fixed size hint for combo box on windows
generated by cgit v0.12 at 2024-12-28 07:08:26 (GMT)