summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-261-22/+8
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QDataStream: speedup steaming of QString by avoiding an unesessary copy.
| * QDataStream: speedup steaming of QString by avoiding an unesessary copy.Olivier Goffart2010-10-261-22/+8
| | | | | | | | | | | | The operator<< now does the same way as the operator>> Reviewed-by: Shane Kearns
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-266-9/+19
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Support to build Qt for Symbian on Mac OS X with gcce compiler. Fixed library and header definitions for Symbian builds on Linux. Got rid of some "duplicate library" warnings. Added wrapper for the elf2e32_qtwrapper script. Changed various qmake constructs to support Windows. Fixed various quotation problems when porting to Windows. Fixed some preprocessor parameters for Mac support. Removed the need for S60main.rsc resource file in Symbian. Added detection of bat files to the qtPrepareTool function. Renamed the symbian/linux-* mkspecs to symbian-*. Fixed library ordering when linking to qtmain.
| * \ Merge branch 'macMakefileBuildSupport' into master.Liang Qi2010-10-266-9/+19
| |\ \ | | |/ | |/|
| | * Support to build Qt for Symbian on Mac OS X with gcce compiler.Liang Qi2010-10-261-1/+1
| | | | | | | | | | | | | | | RevBy: axis RevBy: Morten Johan Sørvig
| | * Fixed library and header definitions for Symbian builds on Linux.axis2010-10-212-4/+8
| | | | | | | | | | | | | | | | | | | | | RevBy: Gareth Stockwell ...who was right to point out that the is_using_gnupoc scheme is terrible, so now we have a task for getting rid of that, QTBUG-14361.
| | * Changed various qmake constructs to support Windows.axis2010-10-211-2/+8
| | | | | | | | | | | | RevBy: Thomas Zander
| | * Removed the need for S60main.rsc resource file in Symbian.Janne Anttila2010-10-217-57/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt upgrade was failing since the s60main.rsc is being locked by S60 application framework. And when installer detects that old version of Qt has already been installed it first tries to uninstall the old one and then install the new one. The uninstallion failed since the file was locked by the running Qt application. It should be noted that this patch fixes the Qt upgradibility only for Qt versions where patch is included. I.e. the versions before 4.7.2 need a different mechanism to be upgradable. This different mechanism is based on partial upgrade SIS packages as described in QT-4052. Task-number: QT-3471 Reviewed-by: Axis
| | * Renamed the symbian/linux-* mkspecs to symbian-*.axis2010-10-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done for a number of reasons: - In order to get better consistency with the other mkspecs, which have the target system name followed by a hyphen and the compiler name. - There is no real reason why we should have specific mkspecs for compiling Symbian under Linux, when it is equally likely to work under other operating systems. RevBy: Thomas Zander
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-261-1/+20
|\ \ \ | |/ / |/| |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-261-1/+20
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove qdrawhelper_arm_simd.cpp dependency to u32std.h
| | * | Remove qdrawhelper_arm_simd.cpp dependency to u32std.hJani Hautakangas2010-10-261-1/+20
| | | | | | | | | | | | | | | | Reviewed-by: Shane Kearns
* | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-268-33/+33
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-268-33/+33
| |\ \ \ | | |/ / | |/| | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Run util/normalize on src/declarative.
| | * | Run util/normalize on src/declarative.Yann Bodson2010-10-268-33/+33
| | | |
* | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-261-14/+0
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-261-14/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Phonon MMF backend: removed redundant trace output qmediaplayer: added command-line switch for initial volume
| | * | | Phonon MMF backend: removed redundant trace outputGareth Stockwell2010-10-251-14/+0
| | | | |
* | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-2614-114/+405
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-2514-114/+405
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Simplify calculation of center point and scale for PinchRecongizer Doc: Fixing typo QtDFB: Make transparent windows behave better For meego graphics system, use floyd-steinberg dithering when converting to 16bit. Added support for blitting to native child widgets in GL window surface.
| | * | | | Simplify calculation of center point and scale for PinchRecongizerFrederik Gladhorn2010-10-251-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Constructing a QLineF to get at the centerPoint is not precise and can be done simpler. The scale factor can be assigned directly to d->scaleFactor instead of creating a temporary scaleFactor variable. Reviewed-by: Zeno Albisser
| | * | | | Doc: Fixing typoSergio Ahumada2010-10-255-10/+10
| | | | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-2411-101/+395
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QtDFB: Make transparent windows behave better For meego graphics system, use floyd-steinberg dithering when converting to 16bit. Added support for blitting to native child widgets in GL window surface.
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-2311-101/+395
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QtDFB: Make transparent windows behave better For meego graphics system, use floyd-steinberg dithering when converting to 16bit. Added support for blitting to native child widgets in GL window surface.
| | | | * | | QtDFB: Make transparent windows behave betterAnders Bakken2010-10-223-17/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows with Qt::WA_NoSystemBackground should clear to transparent in beginPaint. Merge-request: 882 Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | | * | | For meego graphics system, use floyd-steinberg dithering when converting to ↵Michael Dominic K2010-10-223-24/+278
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 16bit. Merge-request: 2496 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | | | * | | Added support for blitting to native child widgets in GL window surface.Samuel Rødal2010-10-225-60/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support blitting by copying from the top-level window's back buffer to a temporary texture and then blitting from the texture to the native child widget. Performance suffers, but it's better than failing. Reviewed-by: Gunnar Sletta
* | | | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-10-2610-22/+46
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: add autotest for QString::setRawData() Fixed case of a library file name to enable MinGW builds on Fedora. Doc: Made Qt::TextLongestVariant internal again. Doc: Fixed minor documentation issues. Doc: Reorganized the platform and compiler notes pages. Doc: Removed non-ASCII characters and reformatted the text. Doc: Fixed documentation style and qdoc warnings. Doc: Fixed qdoc warnings. Doc: Fixed qdoc warnings. Doc: Fixed snippet reference for the Getting Started QML guide. Doc: Fixed warnings caused by an earlier change. Made docs consistent. Doc: Fixed warnings caused by an earlier change. Made docs consistent. Doc: Renamed an external reference to work around an auto-linking issue. Doc: Fixed qdoc warnings. Doc: Fixed links to the online BSD license information. Doc: Fixed qdoc warnings. Doc: Re-added a link to the Qt site related to testing tools. Doc: Marked some new properties as internal for now. Doc: Renamed a project file. Doc: Added missing examples and snippets.
| * \ \ \ \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-2510-22/+46
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-10-2510-22/+46
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: Fixed case of a library file name to enable MinGW builds on Fedora. Doc: Made Qt::TextLongestVariant internal again. Doc: Fixed minor documentation issues. Doc: Reorganized the platform and compiler notes pages. Doc: Removed non-ASCII characters and reformatted the text. Doc: Fixed documentation style and qdoc warnings. Doc: Fixed qdoc warnings. Doc: Fixed qdoc warnings. Doc: Fixed snippet reference for the Getting Started QML guide. Doc: Fixed warnings caused by an earlier change. Made docs consistent. Doc: Fixed warnings caused by an earlier change. Made docs consistent. Doc: Renamed an external reference to work around an auto-linking issue. Doc: Fixed qdoc warnings. Doc: Fixed links to the online BSD license information. Doc: Fixed qdoc warnings. Doc: Re-added a link to the Qt site related to testing tools. Doc: Marked some new properties as internal for now. Doc: Renamed a project file. Doc: Added missing examples and snippets.
| | | * | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-241-3/+11
| | | |\ \ \ \ \ | | | | |/ / / /
| | | * | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-2310-34/+129
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | * | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-2212-253/+452
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | * | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-215-15/+46
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-2052-2826/+2868
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-2052-1333/+1446
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-153-5/+13
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-1481-716/+1516
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Doc: Made Qt::TextLongestVariant internal again.David Boddie2010-10-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This undoes change 43e6ec9f01693044f7bc1. This enum value is internal and not generally supported by Qt. Reviewed-by: Olivier Goffart
| | | * | | | | | | | | | Doc: Fixed minor documentation issues.David Boddie2010-10-122-3/+3
| | | | | | | | | | | | |
| | | * | | | | | | | | | Doc: Fixed documentation style and qdoc warnings.David Boddie2010-10-082-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12071
| | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-0850-175/+423
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Doc: Fixed qdoc warnings.David Boddie2010-10-072-9/+5
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-0727-324/+1017
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Doc: Fixed qdoc warnings.David Boddie2010-10-072-2/+3
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Doc: Marked some new properties as internal for now.David Boddie2010-10-071-0/+27
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-251-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Update changelog Fix for QTBUG-14497 - X11 error (X_CopyRect/BadMatch) when using a translucent widge in multi-screen environment
| * | | | | | | | | | | | | | Fix for QTBUG-14497 - X11 error (X_CopyRect/BadMatch) when using a ↵Christian Ehrlicher2010-10-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translucent widge in multi-screen environment Merge-request: 865 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | | | | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-2551-69/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fixed many spelling errors.Rohan McGovern2010-10-2551-69/+69
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
generated by cgit v0.12 at 2024-12-28 20:29:06 (GMT)