summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* doc: Fixed many broken links.Martin Smith2010-05-1920-50/+50
|
* doc: Fixed many broken links.Martin Smith2010-05-1911-64/+49
|
* qdoc: Set back to 3 cols for class list; we have a scrollbar now.Martin Smith2010-05-191-1/+1
|
* Fix build on Mac OS X and Windows.Aaron McCarthy2010-05-194-13/+13
|
* Remove obsolete and broken qvfb skins.Jason McDonald2010-05-1925-437/+4
| | | | Reviewed-by: Trust Me
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-1947-2869/+3034
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Only setup ICD test data when ICD is enabled. Doc: Fixed two diagrams and finally committed images for them. Make sure cursorPositionChanged is emitted when doing undo/redo Some more 4.7.0 changes Fix cosmetic issue in designer filter edits Doc: Adding support for IE 6, 7 and 8 doc: Updated the widgets tutorial to work without page links. My 4.7.0 changes Added support for es_419 locale. Added Korean and Nynorsk locales support on Symbian. Gestures in GraphicsView do not require a viewport to subscribe to gestures. Upgraded QLocale to Unicode CLDR 1.8.1 Removed the "maybe" timer from gesturemanager. Fixes a crash and a memory leak in gesturemanager. Embedded changes for 4.7 Added a default value for optimization settings. Update Polish translations
| * Only setup ICD test data when ICD is enabled.Aaron McCarthy2010-05-193-12/+12
| | | | | | | | | | Fixes unit test build failures introduced in 90de3e5c903b67b2e5f3d7dc14266fe24f1daa23.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-05-1813-5/+71
| |\
| | * Make sure cursorPositionChanged is emitted when doing undo/redoThorbjørn Lindeijer2010-05-181-0/+8
| | | | | | | | | | | | | | | Done-by: mae Reviewed-by: Thorbjørn Lindeijer
| | * Some more 4.7.0 changesJens Bache-Wiig2010-05-181-2/+17
| | |
| | * Fix cosmetic issue in designer filter editsJens Bache-Wiig2010-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | | This makes the icon position similar to Qt Creator and more consistent. Reviewed-by: trustme
| | * Doc: Adding support for IE 6, 7 and 8Morten Engvoldsen2010-05-1810-2/+45
| | | | | | | | | | | | Fixing index page bugs
| * | Doc: Fixed two diagrams and finally committed images for them.David Boddie2010-05-186-70/+68
| |/ | | | | | | Reviewed-by: Trust Me
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-1825-2713/+2812
| |\
| | * My 4.7.0 changesKent Hansen2010-05-181-0/+22
| | |
| | * Added support for es_419 locale.Denis Dzyubenko2010-05-187-358/+376
| | | | | | | | | | | | | | | | | | | | | | | | Added a new country code "419" which stands for "Latin America and the Caribbean". This is the first three-letter country code (from UN M.49). Task-number: QT-3312 Reviewed-by: Thiago Macieira
| | * Added Korean and Nynorsk locales support on Symbian.Denis Dzyubenko2010-05-181-0/+2
| | | | | | | | | | | | | | | | | | Task-number: QT-3368 Task-number: QT-3370 Reviewed-by: Thiago Macieira
| | * Gestures in GraphicsView do not require a viewport to subscribe to gestures.Denis Dzyubenko2010-05-186-25/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | When a graphicsitem subscribes to a gesture the viewport is implicitly subscribed to it as well. Task-number: QTBUG-9849 Reviewed-by: Olivier Goffart Reviewed-by: Mikko Harju
| | * Upgraded QLocale to Unicode CLDR 1.8.1Denis Dzyubenko2010-05-183-1668/+1668
| | | | | | | | | | | | Reviewed-by: trustme
| | * Removed the "maybe" timer from gesturemanager.Denis Dzyubenko2010-05-182-38/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to users of the api "maybe" timer (that is supposed to cancel gestures that have stayed in the "MaybeGesture" state for too long) is not useful and might even harm some gestures, so removing it completely and leaving it up to the author of a gesture recognizer to make sure the state machine is implemented properly. Task-number: QTBUG-9926 Reviewed-by: Thomas Zander
| | * Fixes a crash and a memory leak in gesturemanager.Denis Dzyubenko2010-05-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | need to remove a QGesture object pointer from an internal hash when the widget/graphicsobject gets destroyed. Task-number: QTBUG-9801 Reviewed-by: Thomas Zander
| | * Embedded changes for 4.7Paul Olav Tvete2010-05-181-0/+2
| | |
| | * Added a default value for optimization settings.Martin Petersson2010-05-181-0/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-10728 Reviewed-by: Thierry
| | * Update Polish translationsJarek Kobus2010-05-186-621/+618
| | |
| * | doc: Updated the widgets tutorial to work without page links.Martin Smith2010-05-183-71/+74
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-1816-16/+151
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to cacbdf18fc917122834042d77a9164a490aafde4 Updated WebKit to 4696beb87359fe9236d23e0791526eb38dab341d Updated WebKit to 3d774b9df1f963452b1cfe34f9fafad0d399372a
| * | | Updated WebKit to cacbdf18fc917122834042d77a9164a490aafde4Simon Hausmann2010-05-184-6/+18
| | | | | | | | | | | | | | | | Cherry pick http://trac.webkit.org/changeset/59606 to fix auto-test regression of r59563
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-1816-16/+139
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 4696beb87359fe9236d23e0791526eb38dab341d Updated WebKit to 3d774b9df1f963452b1cfe34f9fafad0d399372a
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-1716-16/+139
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 4696beb87359fe9236d23e0791526eb38dab341d Updated WebKit to 3d774b9df1f963452b1cfe34f9fafad0d399372a
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-1716-16/+139
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 4696beb87359fe9236d23e0791526eb38dab341d Updated WebKit to 3d774b9df1f963452b1cfe34f9fafad0d399372a
| | | | * | | Updated WebKit to 4696beb87359fe9236d23e0791526eb38dab341dSimon Hausmann2010-05-167-8/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/38444> || [Qt] GraphicsLayer caches directly composited images || || <https://webkit.org/b/37684> || [Qt] JSValue QtClass::fallbackObject can be optimized || || <https://webkit.org/b/37701> || [Qt] Target(WebCore,jsc,...) must depends on static library of JavaScriptCore ||
| | | | * | | Updated WebKit to 3d774b9df1f963452b1cfe34f9fafad0d399372aSimon Hausmann2010-05-1513-10/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/37665> || [Qt] Rename QtLauncher to QtTestBrowser || || <https://webkit.org/b/37381> || [Qt] animations/dynamic-stylesheet-loading.html fails with accelerated compositing || || <https://webkit.org/b/38630> || VS2010 asserts a null iterator passed to std::copy in Vector::operator= || || <https://webkit.org/b/38440> || [Qt] use QT_MOBILE_THEME in Symbian || || <https://webkit.org/b/39031> || CSSParser::parseColor() shouldn't alter 'color' unless passed a valid color string. || || <https://webkit.org/b/38949> || JavaScript unable to invoke methods declared in QML ||
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-184-69/+60
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Compile with Gcc 4.1 Optimized pixmapcache key generation for icons and styles
| * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-174-69/+60
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Compile with Gcc 4.1 Optimized pixmapcache key generation for icons and styles
| | * | | | | | Compile with Gcc 4.1Olivier Goffart2010-05-171-0/+1
| | | | | | | |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-174-69/+59
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Optimized pixmapcache key generation for icons and styles
| | | * | | | | Optimized pixmapcache key generation for icons and stylesOlivier Goffart2010-05-174-69/+59
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This re-apply commit c8d2e18c4b431870560f324a17f20904bb47ae68 from Jens that was reverted in b0f4dab4 because it did not compile. Added the missing include to make it compile on mac Task-number: QTBUG-9850
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-182-2/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qmake/MinGw: Link statically.
| * | | | | qmake/MinGw: Link statically.Friedemann Kleint2010-05-182-2/+3
| | |_|_|/ | |/| | | | | | | | | | | | | Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-179-10/+32
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix a small typo in assistant manual: hompage -> homepage Print icon in doc pages has no effect. Assistant has unnecessary repaints when expand/collapse selected node. Compile fixes. Changelog: Added Designer/uic3 changes for 4.7.0.
| * | | Fix a small typo in assistant manual: hompage -> homepageLaszlo Papp2010-05-171-1/+1
| | | |
| * | | Print icon in doc pages has no effect.kh12010-05-173-0/+3
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10579 Reviewed-by: ck
| * | | Assistant has unnecessary repaints when expand/collapse selected node.kh12010-05-171-7/+11
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10575 Reviewed-by: ck
| * | | Compile fixes.ck2010-05-173-0/+5
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-171-2/+12
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Changelog: Added Designer/uic3 changes for 4.7.0.
| * | | Changelog: Added Designer/uic3 changes for 4.7.0.Friedemann Kleint2010-05-171-2/+12
| | | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-17429-673/+1254
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Move xmldata example into rssnews demo. Move Q_ENUMS to start of class declaration Restructure QDeclarativeAbstractBinding destructor Don't call pure virtual method in ~QDeclarativeAbstractBinding() Fix examples autotest when compiled without webkit or xmlpatterns Check for acquireReg() failure Focus should be applied to focus scopes all the way up the chain, not Add focus docs snippets Fix doc for status, add Image::onLoaded. Don't crash due to recursive positioning. ListModel::get() shouldn't print warnings for invalid indices since it Add \brief to TextInput Add missing .pro Restructure the examples. They are now organized into various graphicsWidgets doc example was previously removed Doc fix Add a "priority" property to Keys and KeyNavigation
| * | | Move xmldata example into rssnews demo.Yann Bodson2010-05-1711-146/+218
| | | |
| * | | Move Q_ENUMS to start of class declarationAaron Kennedy2010-05-172-3/+3
| | | |
| * | | Restructure QDeclarativeAbstractBinding destructorAaron Kennedy2010-05-171-2/+4
| | | |