summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-27120-392/+824
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-262-4/+4
| |\ | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Set the location of the closing brace.
| | * Set the location of the closing brace.Roberto Raggi2010-10-262-4/+4
| | | | | | | | | | | | Reviewed-by: Christian Kamm
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-268-10/+72
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Phonon MMF backend: set _q_DummyWindowSurface property on VideoWidget Create dummy window surface if if _q_DummyWindowSurface property is set Remove widget subtree from backing store tracker when reparented Suppress call to controlVisibilityChanged for null control pointer Fix patch_capabilities.pl script for explicit set of capabilities Fix empty mifconv TARGETFILE in some edge cases.
| | * | Phonon MMF backend: set _q_DummyWindowSurface property on VideoWidgetGareth Stockwell2010-10-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents a window surface being created if Phonon::VideoWidget::setFullScreen(true) is called. Since Qt does not ever render any content to the native window in which video is displayed, creation of a surface for that window would consume memory unnecessarily. Task-number: MOBILITY-1315 Reviewed-by: Jason Barron
| | * | Create dummy window surface if if _q_DummyWindowSurface property is setGareth Stockwell2010-10-261-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: MOBILITY-1315 Reviewed-by: Jason Barron Reviewed-by: bnilsen
| | * | Remove widget subtree from backing store tracker when reparentedGareth Stockwell2010-10-263-3/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a native widget is reparented such that the value of maybeBackingStore() changes, it and all of its native descendents must be removed from the old QWidgetBackingStoreTracker. If this is not done, the backing store may not be deleted when the top-level widget is hidden, thereby consuming memory unnecessarily. Task-number: MOBILITY-1315 Reviewed-by: Jason Barron Reviewed-by: bnilsen
| | * | Suppress call to controlVisibilityChanged for null control pointerGareth Stockwell2010-10-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At this point, old_winid may be null. Passing a null pointer to controlVisibilityChanged is actually a no-op, due to the 'QWidgetPrivate::mapper->contains(control)' check, but suppressing the function call altogether clarifies the intent of the code slightly. Reviewed-by: Jason Barron
| | * | Fix patch_capabilities.pl script for explicit set of capabilitiesMiikka Heikkinen2010-10-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Elftran command never got executed when explicit set of capabilities was defined. No warning or error was printed either, making it rather confusing for user. Task-number: QTBUG-14730 Reviewed-by: Janne Koskinen
| | * | Fix empty mifconv TARGETFILE in some edge cases.Miikka Heikkinen2010-10-262-2/+7
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Only add ICON for Qt gui application projects that do not explicitly want to suppress it in symbianpkgrules.pri. This logic should match the logic used for setting RSS_RULES.icon_file and thus avoid empty TARGETFILE in bld.inf mifconv extension. Task-number: QT-4193 Reviewed-by: Janne Koskinen
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-268-8/+8
| |\ \ | | |/ | |/| | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc : Fixing typo.
| | * Doc : Fixing typo.Sergio Ahumada2010-10-268-8/+8
| | |
| * | 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' 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' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-264-49/+46
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | |
| | * | qmediaplayer: added command-line switch for initial volumeGareth Stockwell2010-10-253-35/+46
| | | | | | | | | | | | | | | | | | | | | | | | Initial volume can be set using the following switch: -volume <level> where 0.0 <= level <= 1.0
| * | | 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.
| | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-2211-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 '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-251-0/+38
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: add autotest for QString::setRawData()
| | * | | | | | | add autotest for QString::setRawData()Oswald Buddenhagen2010-10-251-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and improve the one for fromRawData() marginally Reviewed-by: olivier
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-10-2597-551/+4338
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-2571-94/+94
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fixed many spelling errors.
| | * | | | | | | Fixed many spelling errors.Rohan McGovern2010-10-2571-94/+94
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-10-256-79/+104
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Demo Spectrum wav data size is not calculated correctly Revert "Don't define highp/mediump/lowp if desktop GL has them" Rename .pro file to match directory name. Doc: Fixed qdoc warning. Add header guards to audio example headers.
| | * | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-10-256-79/+104
| | |\ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qcryptographichash.cpp src/opengl/qgl_p.h
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-10-132-79/+90
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Demo Spectrum wav data size is not calculated correctly
| | | * | | | | | Demo Spectrum wav data size is not calculated correctlyJustin McPherson2010-10-132-79/+90
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Grab length of audio data from Data chunk size - Read from the device no greater than the audio Data chunk size Task-number: QTBUG-13779 Reviewed-by: Andrew den Exter
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-121-0/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Rename .pro file to match directory name.
| | | * | | | | | Rename .pro file to match directory name.Jason McDonald2010-10-121-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: none Reviewed-by: Trust Me
| | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-124-16/+4
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Revert "Don't define highp/mediump/lowp if desktop GL has them"
| | | * | | | | | Revert "Don't define highp/mediump/lowp if desktop GL has them"Trond Kjernåsen2010-10-124-16/+4
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6155050f68cc86c445552da61a5f240c16f5e2cd. The GL_ARB_ES2_compatibility extension does not mention the lowp, mediump or highp keywords. Task-number: QTBUG-14384 Reviewed-by: Samuel Reviewed-by: Prasanth
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-10-113-0/+14
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Add header guards to audio example headers.
| | | * \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-10-103-0/+14
| | | |\ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Add header guards to audio example headers.
| | | * | | | | | Add header guards to audio example headers.Justin McPherson2010-10-083-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13413 Reviewed-by: Andrew den Exter
| | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-101-1/+1
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Fixed qdoc warning.
| | | * | | | | | | Doc: Fixed qdoc warning.David Boddie2010-10-081-1/+1
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: hjk
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-25137-4616/+4735
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-241-3/+11
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-231-3/+11
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | / / / | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix warning introduced by last commit on hiding of the 'd' member Fix access to uninitialised memory in case of new throwing
| | | * | | | | Fix warning introduced by last commit on hiding of the 'd' memberThiago Macieira2010-10-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qsharedpointer_impl.h: In constructor 'QtSharedPointer::ExternalRefCount<T>::ExternalRefCount(T*, Deleter)': qsharedpointer_impl.h:385: warning: declaration of 'd' shadows a member of 'this'
generated by cgit v0.12 at 2025-08-18 03:23:28 (GMT)