summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update QtDeclarative def filesJoona Petrell2010-07-232-6/+8
|
* Fix crash in MouseAreaJoona Petrell2010-07-231-1/+2
| | | | | Task-number: Reviewed-by: Martin Jones
* CompileAaron Kennedy2010-07-231-6/+3
|
* Fixes undeleted timers (and endless warning from the event loop aboutAaron Kennedy2010-07-231-1/+1
| | | | | | | invalid timers). Authored-by: Daniel Molkentin Reviewed-by: Marco Bubke
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-2364-175/+483
|\
| * Remove unneeded member variable.Michael Brasser2010-07-222-6/+3
| |
| * Fix test.Michael Brasser2010-07-221-0/+1
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-2295-754/+1935
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (34 commits) Fix TextInput echoMode autotest on Linux Reuse QML lexer to simplify .pragma script logic Fix TextEdit text attribute and text stored in the internal QTextDocument having different contents Remove QDeclarativeItem::childrenChanged() signal overload Update QtGui and QtDeclarative def files Make rootContext and engine pointers in QDeclarativeView API const Add additional QVariant benchmarks. Allow MouseArea dragging to filter mouse events from descendants Expand QDeclarativeExtensionPlugin docs Add missing snippet files Expand QtObject doc Indicate default values Use snippets instead to avoid quoting license headers Rename remaining 'wantsFocus'. Bounding rect of text was not always calculated correctly. Add QML tutorials to the tutorials page QML focus API updates. Do not show copyright header in documentation. Ensure redirects (and indeed all reply process) is done in the right thread. Only ignore the same target value for a Behavior when it is running. ...
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-2295-754/+1935
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (34 commits) Fix TextInput echoMode autotest on Linux Reuse QML lexer to simplify .pragma script logic Fix TextEdit text attribute and text stored in the internal QTextDocument having different contents Remove QDeclarativeItem::childrenChanged() signal overload Update QtGui and QtDeclarative def files Make rootContext and engine pointers in QDeclarativeView API const Add additional QVariant benchmarks. Allow MouseArea dragging to filter mouse events from descendants Expand QDeclarativeExtensionPlugin docs Add missing snippet files Expand QtObject doc Indicate default values Use snippets instead to avoid quoting license headers Rename remaining 'wantsFocus'. Bounding rect of text was not always calculated correctly. Add QML tutorials to the tutorials page QML focus API updates. Do not show copyright header in documentation. Ensure redirects (and indeed all reply process) is done in the right thread. Only ignore the same target value for a Behavior when it is running. ...
| | | * Fix TextInput echoMode autotest on LinuxJoona Petrell2010-07-221-0/+4
| | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Michael Brasser
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-226-5/+36
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added silent behavior to the most important Symbian build steps. Fixed compiling with symbian/linux-armcc and configure -silent option Removed some warnings from armcc that are unneeded. Made the makefile build system use QMAKE_CFLAGS.xxx properly. Automatically disabled unsupported modules for certain compilers. Fixed an incorrect profile inclusion.
| | * | | Added silent behavior to the most important Symbian build steps.axis2010-07-222-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-11927 RevBy: Trust me
| | * | | Fixed compiling with symbian/linux-armcc and configure -silent optionaxis2010-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-11927 RevBy: Trust me
| | * | | Removed some warnings from armcc that are unneeded.axis2010-07-221-1/+10
| | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | * | | Made the makefile build system use QMAKE_CFLAGS.xxx properly.axis2010-07-222-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the variable would be appended too soon, so not all values would be included. Now it is one of the last steps. RevBy: Trust me
| | * | | Automatically disabled unsupported modules for certain compilers.axis2010-07-221-0/+7
| | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | * | | Fixed an incorrect profile inclusion.axis2010-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-2253-150/+399
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: If the QEventDispatcherGlibc causes warnings, it should say so Remove a warning message that no longer appears after all on Windows Drag & Drop failing in itemviews on Cocoa. qdoc: Removed debug code. qdoc: Fixed reporting of read-only status for QML properties. Fix the smallFont test failure for Mac and Linux Revert "Compile fix for MSVC" Compile fix for MSVC Improve QAccessible for QAccessibleTabBar Improve QAccessible for QTabBar fix the export macros for the QtDBus module rebuild configure.exe make "configure -qt-gif" work again on Windows Fix a typo in harfbuzz thai line breaking. Ensure that font sizes that are > 0 and < 1 are still respected
| | * | | If the QEventDispatcherGlibc causes warnings, it should say soDaniel Molkentin2010-07-221-3/+3
| | | | | | | | | | | | | | | | | | | | Reviewed-By: dt
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Andy Shaw2010-07-221-1/+4
| | |\ \ \
| | | * | | Drag & Drop failing in itemviews on Cocoa.Prasanth Ullattil2010-07-221-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While generating the QDragMoveEvent, we were always reusing the last drop action set by the user. This is not correct, we should copy the action only if a valid action set before. This is the behavior on Windows. Task-number: QTBUG-9486 Reviewed-by: Denis
| | * | | | Remove a warning message that no longer appears after all on WindowsAndy Shaw2010-07-221-5/+1
| | |/ / / | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | qdoc: Removed debug code.Martin Smith2010-07-221-1/+0
| | | | |
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-22456-4983/+11874
| | |\ \ \
| | | * | | Fix the smallFont test failure for Mac and LinuxAndy Shaw2010-07-222-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kim
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-2134-77/+113
| | | |\ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revert "Compile fix for MSVC" Compile fix for MSVC Improve QAccessible for QAccessibleTabBar Improve QAccessible for QTabBar fix the export macros for the QtDBus module rebuild configure.exe make "configure -qt-gif" work again on Windows Fix a typo in harfbuzz thai line breaking. Ensure that font sizes that are > 0 and < 1 are still respected
| | | | * | Revert "Compile fix for MSVC"Robert Loehning2010-07-211-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4e26c800f2274754a670b0353e3fb4afd55514c3. Already fixed in ceff2321d7b7eaa4608a1baa5de66dbce8733342
| | | | * | Compile fix for MSVCRobert Loehning2010-07-211-1/+2
| | | | | |
| | | | * | Improve QAccessible for QAccessibleTabBarSebastian Sauer2010-07-211-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On QAccessibleTabBar::text return text of the current tab for the case the QTabBar itself is asked for it's Name. Merge-request: 2405 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | | | * | Improve QAccessible for QTabBarSebastian Sauer2010-07-211-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a QTabBar on changing the curren tab call QAccessible::updateAccessibility to allow screen-readers like JAWS to read the tabText of the newly selected tab. Merge-request: 662 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | | | * | fix the export macros for the QtDBus moduleRomain Pokrzywka2010-07-2127-71/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2439 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | | | * | rebuild configure.exeJoerg Bornemann2010-07-211-0/+0
| | | | | |
| | | | * | make "configure -qt-gif" work again on WindowsJoerg Bornemann2010-07-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The value for GIF must be "plugin" and not "yes". Reviewed-by: danimo
| | | | * | Fix a typo in harfbuzz thai line breaking.Ritt Konstantin2010-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Lars Knoll
| | | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Andy Shaw2010-07-2121-917/+164
| | | | |\ \
| | | | * | | Ensure that font sizes that are > 0 and < 1 are still respectedAndy Shaw2010-07-212-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | What was happening was that when a font size of 0.5 was used then it would end up being set to be point size 0. This now respects the setting used. Autotest is included in this patch for this case. Reviewed-by: Kim
| | * | | | | qdoc: Fixed reporting of read-only status for QML properties.Martin Smith2010-07-2216-68/+281
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11512
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-223-14/+40
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Improve the conversion from indexted to RGB16 Avoid qMin() for each pixel when converting indexed colors in-place Premultiply the color table instead of each pixel for image conversion Switch the default value for configure's -separate-debug-info to "no". Docs: Additional HTML extraction marks for enumerations.
| | * | | | | Improve the conversion from indexted to RGB16Benjamin Poulain2010-07-221-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of converting each color, we create a color table with the RGB16 colors. The conversion can be done for each pixel directly with the table. Reviewed-by: Kim Reviewed-by: Olivier Goffart
| | * | | | | Avoid qMin() for each pixel when converting indexed colors in-placeBenjamin Poulain2010-07-221-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of checking if the value is in boundary for each pixel, we can fill the color table with 256 value and convert the colors directly. This optimization is an idea of Kim Kalland. Reviewed-by: Kim Reviewed-by: Olivier Goffart
| | * | | | | Premultiply the color table instead of each pixel for image conversionBenjamin Poulain2010-07-221-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When converting indexed images in place, each color was converted to premultiplied. Instead, we can just convert the color table like it is done in the non-in-place version. Reviewed-by: Kim
| | * | | | | Switch the default value for configure's -separate-debug-info to "no".hjk2010-07-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "yes" case slows us down on several occasions: (a) the CRC version used slows down loading debug info when debugging a Qt application significantly, (b) it does not work wit gdb 7.2's dwarf indexing (again, much slower startup), and (c) (less important) the stripping takes extra time for each of us when building Qt. The flag is still supported for distributions or individuals that want to use it. Reviewed-by: brad
| | * | | | | Docs: Additional HTML extraction marks for enumerations.Leandro Melo2010-07-221-1/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | Reviewed-by: Martin Smith
* | | | | | Generalize qml "registration"Aaron Kennedy2010-07-226-21/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While it is difficult to predict the future, the hope is that this might give us a little more flexibility when it comes to fixing bugs etc. in patch releases.
* | | | | | Fix compiler warningAaron Kennedy2010-07-221-2/+0
| |_|_|_|/ |/| | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-2219-37/+326
|\ \ \ \ \
| * | | | | Fix TextEdit text attribute and text stored in the internal QTextDocument ↵Joona Petrell2010-07-222-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | having different contents Task-number: QTBUG-12339 Reviewed-by: Martin Jones
| * | | | | Remove QDeclarativeItem::childrenChanged() signal overloadMartin Jones2010-07-224-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broke signal handlers in QML Task-number: QTBUG-12335 Reviewed-by: Aaron Kennedy
| * | | | | Update QtGui and QtDeclarative def filesJoona Petrell2010-07-224-12/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Michael Brasser
| * | | | | Make rootContext and engine pointers in QDeclarativeView API constJoona Petrell2010-07-224-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12322 Reviewed-by: Aaron Kennedy