summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Tweak import behaviourAlan Alpert2010-03-255-6/+6
| | | | | | | | | | | | | The implicit import of types in the same directory/module now imports version -1 (which means all versions). This fixes the Twitter demo. Additionally, the current directory is not added to the imports path. No functionality is lost, as you can import local modules with relative paths for the same effect. Improved docs are on the way. Reviewed-by: mae
* Minehunt readme was missing a step.Alan Alpert2010-03-231-0/+2
|
* Make more tests compile on solaris-ccAlan Alpert2010-03-235-19/+19
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-23172-3296/+3624
|\ | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Warwick Allison2010-03-232-21/+14
| |\ | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-232-21/+14
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: API fixes to QGLBuffer.
| | | * API fixes to QGLBuffer.Rhys Weatherley2010-03-222-21/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use GLuint for bufferId(), not uint. Replace the raw bind() function with a raw release(), because that's the only useful case for being able to do a raw glBindBuffer(). Reviewed-by: Daniel Pope
| * | | Usability improvements for photoviewer demo.Yann Bodson2010-03-235-8/+32
| | | |
| * | | Fix warning.Michael Brasser2010-03-231-1/+1
| | | |
| * | | Changing the alignment property should trigger a repaint.Alexis Menard2010-03-232-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Just clear the cache when the property changes. Task-number:QTBUG-8155 Reviewed-by:Yann Bodson
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-2334-1657/+257
| |\ \ \
| | * | | Change default RotationAnimation direction.Michael Brasser2010-03-233-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shortest as default too often led to unintuitive behavior. For example, RotationAnimation { from: 0; to: 360 } will not animate at all. Numerical gives the least surprising results.
| | * | | Add missing NOTIFYs.Michael Brasser2010-03-234-7/+41
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8816
| | * | | Remove ParentAction.Michael Brasser2010-03-2317-1527/+19
| | | | | | | | | | | | | | | | | | | | It has been replaced with ParentAnimation.
| | * | | Editable tag in photoviewer demo.Yann Bodson2010-03-234-15/+61
| | | | |
| | * | | Small photoviewer improvementsYann Bodson2010-03-233-5/+13
| | | | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-232-7/+2
| | |\ \ \
| | | * | | Fix mutex handling that was causing tests to sometimes crash/fail.Bea Lam2010-03-232-7/+2
| | | | | |
| | * | | | DocAaron Kennedy2010-03-237-87/+111
| | |/ / /
| * | | | Basic Loader origin safety (for discussion).Warwick Allison2010-03-237-2/+69
| | | | |
| * | | | Show loading progressWarwick Allison2010-03-233-2/+21
| |/ / / | | | | | | | | | | | | Task-number: QTBUG-9260
| * | | Fix test (StoreScriptImported shifted enum values)Warwick Allison2010-03-221-2/+11
| | | | | | | | | | | | | | | | | | | | Adds test for StoreScriptImported. Makes invalid instruction test resistant to future changes.
| * | | Manual merge.Warwick Allison2010-03-2216-11/+95
| | | |
| * | | Test imports with realistic paths (previously passed accidentally).Warwick Allison2010-03-225-7/+15
| | | | | | | | | | | | | | | | Fix failure when import path is ancestor dir of other import path.
| * | | Add Script removal to QmlChanges.txtMartin Jones2010-03-221-0/+38
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2299-1034/+890
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (26 commits) Use canonical form for headers Remove exporting of QDeclarativeContext class symbols Remove non-existing header from pri file Fix Loader crash. Compile in namespace Deprecate inline Script {} blocks Update metaobjectbuilder version test. Set role names for QFileSystemModel and QDirModel Removed wrong parenthesis around property NOTIFY declaration Remove dead performance measurement code from QML Fix warning mentioned in the comments of QTBUG-9182. Fix test. Ensure positioner animations are triggered correctly Fix qdeclarativeqt::createQmlObject autotest Add MiddleButton = MidButton to MouseButtons enum. Fix qdeclarativetextedit::delegateLoading autotest Fix Behavior documentation due to easing changes. Fix crash when calling createObject on a component with errors. Initialize variable. Produce an error when trying to create objects in a PropertyChanges. ...
| | * | Use canonical form for headersKai Koehne2010-03-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Allows QmlDesigner to use qdeclarativestate_p_p.h Reviewed-by: Marco Bubke
| | * | Remove exporting of QDeclarativeContext class symbolsKai Koehne2010-03-221-1/+1
| | | | | | | | | | | | | | | | We're not using it in QmlDesigner any more
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2298-1031/+887
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (24 commits) Remove non-existing header from pri file Fix Loader crash. Compile in namespace Deprecate inline Script {} blocks Update metaobjectbuilder version test. Set role names for QFileSystemModel and QDirModel Removed wrong parenthesis around property NOTIFY declaration Remove dead performance measurement code from QML Fix warning mentioned in the comments of QTBUG-9182. Fix test. Ensure positioner animations are triggered correctly Fix qdeclarativeqt::createQmlObject autotest Add MiddleButton = MidButton to MouseButtons enum. Fix qdeclarativetextedit::delegateLoading autotest Fix Behavior documentation due to easing changes. Fix crash when calling createObject on a component with errors. Initialize variable. Produce an error when trying to create objects in a PropertyChanges. Fix Flipable crash. Reduce amount of qmldir parsing ...
| * | \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-225-63/+57
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix a problem with the selection losing items when layout is changed refactor connections/disconnections in QItemSelectionModel small little change to the initialization of item views disable copy of QPainterPathStroker as its not copiable. Added warnings on non-created buffer in QGLBuffer
| | * | Fix a problem with the selection losing items when layout is changedThierry Bastian2010-03-221-0/+4
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-2804 Reviewed-by: ogoffart
| | * | refactor connections/disconnections in QItemSelectionModelThierry Bastian2010-03-222-60/+26
| | | | | | | | | | | | | | | | Ther was duplicated code and useless disconnections in the destructor
| | * | small little change to the initialization of item viewsThierry Bastian2010-03-221-3/+1
| | | | | | | | | | | | | | | | | | | | we don't need to calldoDelayedItemLayout, setting the flag that the widget needs the item layout is enough
| | * | disable copy of QPainterPathStroker as its not copiable.Gunnar Sletta2010-03-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The introduction of QScopedPointer already broke source compat for this one, not compiling is better than crashing at runtime. Reviewed-by: Trond
| | * | Added warnings on non-created buffer in QGLBufferGunnar Sletta2010-03-221-0/+24
| |/ / | | | | | | | | | Reviewed-by: Rhys Weatherley
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-222-10/+23
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed performance issues when falling back to raster for sub-pixmaps. Dragging headers in item views done right
| | * | Fixed performance issues when falling back to raster for sub-pixmaps.Samuel Rødal2010-03-221-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy the sub-pixmap so that we don't need to convert the entire pixmap to a QImage each time. Reviewed-by: Gunnar Sletta
| | * | Dragging headers in item views done rightGabriel de Dietrich2010-03-221-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until now, the dropped position depended on the position of the middle of the dragged header w.r.t. the hovered header. Now, it only depends on the mouse cursor position and the middle of the hovered header, closer to what happens on Windows or Mac OS. Reviewed-by: Thierry Task-number: QTBUG-6968
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-2292-1512/+2957
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (36 commits) Fixed updating the VKB display when inputting into QGraphicsWebView. Switched out QT_SOURCE_TREE, which is not defined for user apps. QS60Style: All itemviews should indicate selection with tick mark QS60Style assert fails to detect an index failure QScriptClass-implemented constructors lead to application crash Improve test coverage of QScriptClass::Callable extension Change fromSymbianRSgImage() to use the newer version of RSgImage Removed extra space from the command line passed to QProcess in Symbian installTranslatorFunctions doesn't work for custom global object fix QTabBar scroll button arrow position in Windows mobile style Revert "Optimize getting bearings of a glyph on Windows for true type fonts" stabilize tst_QAccessibility::comboBoxTest Enable s60main.rsc infixing. Improved qt_x11_wait_for_window_manager Virtual Keyboard and double tap for Symbian support Whitespace Better handling for NOTIFY in QGraphicsWidget regarding geometry changes Add NOTIFY to size property so QML bindings are working fine. Implement Q_PRIVATE_PROPERTY that allows you to declare properties Don't assert in QScriptValue::call() ...
| | * \ \ Merge branch '4.6-s60' into 4.7-s60axis2010-03-2292-1511/+2956
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe mkspecs/common/symbian/symbian.conf src/gui/graphicsview/qgraphicswidget.h src/gui/kernel/qapplication.cpp src/gui/text/qtextlayout.cpp src/openvg/qpixmapdata_vg.cpp src/s60installs/s60installs.pro tools/runonphone/main.cpp tools/runonphone/serenum_unix.cpp qtextlayout.cpp fixed up together with Eskil. Kept the configure.exe from 4.7 without recompile.
| | | * | | Fixed updating the VKB display when inputting into QGraphicsWebView.axis2010-03-223-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QT-2990 Task: https://bugs.webkit.org/show_bug.cgi?id=36292 RevBy: Simon Hausmann
| | | * | | QS60Style: All itemviews should indicate selection with tick markSami Merila2010-03-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In QS60Style, all itemviews should indicate selection/multiselection with tick mark. Unfortunately it now uses object casting to QListView currently to check the viability of widget to have tick mark. Thus, it fails for QTreeViews and QTableViews. Changing object casting to QAbstractItemView to support all item views. Task-number: QTBUG-9212 Reviewed-by: Alessandro Portale
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-221-1/+1
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style assert fails to detect an index failure
| | | | * | | QS60Style assert fails to detect an index failureSami Merila2010-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style asserts that a given index is correct when setting theme colors. Unfortunately it uses less-and-equal-to operator ('<='), which is incorrect. It should use less-than ('<')operator, otherwise the assert fails when index is equal to number of items in the color table. Task-number: QT-3078 Reviewed-by: Alessandro Portale
| | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-202-3/+119
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QScriptClass-implemented constructors lead to application crash Improve test coverage of QScriptClass::Callable extension
| | | | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-202-3/+119
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QScriptClass-implemented constructors lead to application crash Improve test coverage of QScriptClass::Callable extension
| | | | | * | | | QScriptClass-implemented constructors lead to application crashKent Hansen2010-03-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing popContext() to balance the pushContext(). Task-number: QTBUG-8364 Reviewed-by: Olivier Goffart
| | | | | * | | | Improve test coverage of QScriptClass::Callable extensionKent Hansen2010-03-191-2/+116
| | | | | | | | |
| | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-204-40/+48
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | / / / | | | | | |/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Change fromSymbianRSgImage() to use the newer version of RSgImage Removed extra space from the command line passed to QProcess in Symbian
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-194-40/+48
| | | | |\ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Change fromSymbianRSgImage() to use the newer version of RSgImage Removed extra space from the command line passed to QProcess in Symbian