summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Update when text changes to ""Alan Alpert2010-10-291-1/+2
| | | | | | Also fixes a doc typo. Includes test. Task-number: QTBUG-14469
* Remove unnecessary layouting code from QDeclarativeTextYann Bodson2010-10-281-43/+8
| | | | | Task-number: QTBUG-14795 Reviewed-by: Michael Brasser
* Export private QtDeclarative classes needed by Qt3d on SymbianJoona Petrell2010-10-285-218/+218
| | | | | | | | | | Task-number: QTBUG-14789 Reviewed-by: Rhys Weatherley * QDeclarativeState * QDeclarativeStateGroup * QDeclarativeStateOperation * QDeclarativeTransition
* Fix bug in QML debug client installationAaron Kennedy2010-10-271-1/+1
| | | | | Allow QML debug clients to be installed between the connection being established and the hello message being received.
* Doc clarification for Loader.Michael Brasser2010-10-271-1/+2
|
* 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
* | 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-262-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* 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-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' 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 '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
| | | | | | | | | | | |
* | | | | | | | | | | | Fixed many spelling errors.Rohan McGovern2010-10-2551-69/+69
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | 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'
* | | | | | | | | | | 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 access to uninitialised memory in case of new throwing
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-221-3/+11
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix access to uninitialised memory in case of new throwing
| | * | | | | | | | | Fix access to uninitialised memory in case of new throwingThiago Macieira2010-10-221-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Testing will come later with a full test for exception issues Task-number: QTBUG-14637 Reviewed-by: Olivier Goffart
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-2210-34/+129
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Corrected build fail for autotests QComboBox popup is shown in incorrect location with bottom CBA QS60Style: The QComboBox/QSpinBox text color is not according to theme Using TLS to store QThreadData on Symbian Functions that are externally defined to QtOpenGL needs to be imported. Added include for missing file for Symbian3 Support for clipboard between Qt and Symbian applications
| * | | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-10-224-13/+43
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-229-33/+128
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style: The QComboBox/QSpinBox text color is not according to theme Using TLS to store QThreadData on Symbian Functions that are externally defined to QtOpenGL needs to be imported. Added include for missing file for Symbian3 Support for clipboard between Qt and Symbian applications
generated by cgit v0.12 at 2025-01-07 01:02:17 (GMT)