summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CompileAaron Kennedy2010-04-191-0/+2
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-1968-254/+529
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-195-23/+29
| |\
| | * Add some padding to Rectangles with border to avoid qDrawBorderPixmap() bug.Martin Jones2010-04-191-1/+3
| | | | | | | | | | | | Task-number: QTBUG-5689
| | * Speed up Rectangle creation with pen or gradient slightlyMartin Jones2010-04-192-3/+16
| | |
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-1911-3/+126
| | |\
| | * | Always allow view position to be fixed.Martin Jones2010-04-193-19/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to avoid doing fixup in a direction we were not flicking. This was pointless, and caused bugs when the view transitioned from flickable to not flickable, e.g. by content size change. Fixup following content size is also no longer animated. This can be acheived using a behavoir, for example. Task-number: QTBUG-9961
| * | | Emit runtime warnings through QDeclarativeEngineAaron Kennedy2010-04-1952-228/+374
| | |/ | |/| | | | | | | QTBUG-9726
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-1994-736/+1294
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (30 commits) Update mouse area coordinates automatically when changing position Recognize identifiers containing unicode escape sequences. Fix README Fix doc: QML_DECLARE_TYPE is no longer necessary Fix doc: remote contents requires qmldir Fixed parsing of inner labelled statements. Doc Remove unsupported plugin version flags in .pro files of declarative examples Documentation typo. More QML doc consistency. Ensure existing image is gone before next photo selection. Don't use zoomfactor. Doc: in QML use "real" and "enumeration", not "qreal" and "enum" Doc: Put "default" property label on same line as property name Wait for debug clients asynchronously instead of blocking creation of Test not reliable ResizeMode support for QGraphicsWidgets created with QDeclarativeView More class documentation fixes for declarative. Simplify QML import plugin deployment lines Add QML imports to s60installs.pro ...
| | * | Update mouse area coordinates automatically when changing positionLeonardo Sobral Cunha2010-04-196-3/+114
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Mouse area coordinates are now updated when the mouse area changes position and positionChanged signals are not emitted on mousePress anymore (only mousePosChanged signals). Task-number: QTBUG-9716 Reviewed-by: Michael Brasser
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-185-0/+12
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Fixed compile of JavaScriptCore for Symbian^3. Fix compilation: StringImpl has no public, default constructor JavaScriptCore doesn't need QtGui Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-175-0/+12
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Fixed compile of JavaScriptCore for Symbian^3. Fix compilation: StringImpl has no public, default constructor JavaScriptCore doesn't need QtGui Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x
| | | * | Fixed compile of JavaScriptCore for Symbian^3.Rohan McGovern2010-04-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need some additional include paths. Reviewed-by: Thiago Macieira
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-164-0/+10
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Fix compilation: StringImpl has no public, default constructor JavaScriptCore doesn't need QtGui Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-154-0/+10
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Fix compilation: StringImpl has no public, default constructor JavaScriptCore doesn't need QtGui Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x
| | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-154-0/+10
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Fix compilation: StringImpl has no public, default constructor JavaScriptCore doesn't need QtGui Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x
| | | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-144-0/+10
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Fix compilation: StringImpl has no public, default constructor JavaScriptCore doesn't need QtGui Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x
| | | | | | | * | Fix compilation: StringImpl has no public, default constructorThiago Macieira2010-04-142-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error was: platform/text/AtomicStringImpl.h:29: error: base `WebCore::StringImpl' with only non-default constructor in class without a constructor Reviewed-by: Janne Koskinen
| | | | | | | * | JavaScriptCore doesn't need QtGuiThiago Macieira2010-04-141-0/+1
| | | | | | | | |
| | | | | | | * | Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile ↵Thiago Macieira2010-04-142-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | any time soon with C++0x
* | | | | | | | | Partial revert of 348d1f6d421a6e23b769af99608fa6d81631a6c3Warwick Allison2010-04-193-7/+2
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | (accidentally committed changes)
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-1888-733/+1180
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (29 commits) Recognize identifiers containing unicode escape sequences. Fix README Fix doc: QML_DECLARE_TYPE is no longer necessary Fix doc: remote contents requires qmldir Fixed parsing of inner labelled statements. Doc Remove unsupported plugin version flags in .pro files of declarative examples Documentation typo. More QML doc consistency. Ensure existing image is gone before next photo selection. Don't use zoomfactor. Doc: in QML use "real" and "enumeration", not "qreal" and "enum" Doc: Put "default" property label on same line as property name Wait for debug clients asynchronously instead of blocking creation of Test not reliable ResizeMode support for QGraphicsWidgets created with QDeclarativeView More class documentation fixes for declarative. Simplify QML import plugin deployment lines Add QML imports to s60installs.pro Cleanup photoviewer demo. ...
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-1788-733/+1180
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (29 commits) Recognize identifiers containing unicode escape sequences. Fix README Fix doc: QML_DECLARE_TYPE is no longer necessary Fix doc: remote contents requires qmldir Fixed parsing of inner labelled statements. Doc Remove unsupported plugin version flags in .pro files of declarative examples Documentation typo. More QML doc consistency. Ensure existing image is gone before next photo selection. Don't use zoomfactor. Doc: in QML use "real" and "enumeration", not "qreal" and "enum" Doc: Put "default" property label on same line as property name Wait for debug clients asynchronously instead of blocking creation of Test not reliable ResizeMode support for QGraphicsWidgets created with QDeclarativeView More class documentation fixes for declarative. Simplify QML import plugin deployment lines Add QML imports to s60installs.pro Cleanup photoviewer demo. ...
| | * | | | | | Recognize identifiers containing unicode escape sequences.Roberto Raggi2010-04-162-3/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8108 Reviewed-by: Olivier Goffart
| | * | | | | | Fix READMEmae2010-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The base directory is no longer automatically used as import path.
| | * | | | | | Fix doc: QML_DECLARE_TYPE is no longer necessarymae2010-04-162-23/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's sufficient to register a type with qmlRegisterType<T>()
| | * | | | | | Fix doc: remote contents requires qmldirmae2010-04-161-2/+4
| | | | | | | |
| | * | | | | | Fixed parsing of inner labelled statements.Roberto Raggi2010-04-163-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The JS grammar is ambigious and the following statement can be parsed as an object-literal followed by an inserted semicolon or as two labelled statements. outer: { inner: {} } In the old days we used to resolve the conflict by reducing the statement to an expression statement but this was wrong so now we prefer the labelled statement. As nice side effect, we pass two more tests in tests/auto/declarative/parserstress. Task-number: QTBUG-8108
| | * | | | | | DocAaron Kennedy2010-04-161-2/+2
| | | | | | | |
| | * | | | | | Remove unsupported plugin version flags in .pro files of declarative examplesJoona Petrell2010-04-162-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9191 Reviewed-by: Martin Jones
| | * | | | | | Documentation typo.Yann Bodson2010-04-161-8/+8
| | | | | | | |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-162-2/+3
| | |\ \ \ \ \ \
| | | * | | | | | Ensure existing image is gone before next photo selection.Warwick Allison2010-04-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8084
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-1652-538/+836
| | | |\ \ \ \ \ \
| | | * | | | | | | Don't use zoomfactor.Warwick Allison2010-04-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It gives better resolution for text positioning, btu many web sites don't work well with it and WebKit.
| | * | | | | | | | More QML doc consistency.Martin Jones2010-04-164-22/+22
| | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Doc: in QML use "real" and "enumeration", not "qreal" and "enum"Martin Jones2010-04-1612-28/+23
| | | | | | | | |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-1643-592/+930
| | |\ \ \ \ \ \ \
| | | * | | | | | | Wait for debug clients asynchronously instead of blocking creation ofBea Lam2010-04-168-311/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the engine until a debug client has connected. This makes for easier debugging from Qt Creator when debugging C++ and QML together and when debugging an application that has multiple engines.
| | | * | | | | | | Test not reliableBea Lam2010-04-161-8/+0
| | | | | | | | | |
| | | * | | | | | | ResizeMode support for QGraphicsWidgets created with QDeclarativeViewJoona Petrell2010-04-1610-132/+551
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8814 Reviewed-by: alexis
| | | * | | | | | | More class documentation fixes for declarative.Michael Brasser2010-04-167-32/+77
| | | | | | | | | |
| | | * | | | | | | Simplify QML import plugin deployment linesJoona Petrell2010-04-165-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| | | * | | | | | | Add QML imports to s60installs.proJoona Petrell2010-04-161-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9784 Reviewed-by: Martin Jones
| | | * | | | | | | Cleanup photoviewer demo.Yann Bodson2010-04-163-4/+6
| | | |/ / / / / /
| | | * | | | | | clean upWarwick Allison2010-04-161-1/+0
| | | | | | | | |
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-169-11/+60
| | | |\ \ \ \ \ \
| | | * | | | | | | Throw exceptions on programming errors for global functions.Warwick Allison2010-04-169-94/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7897
| | * | | | | | | | Doc: Put "default" property label on same line as property nameMartin Jones2010-04-162-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6336
| | * | | | | | | | Doc: make note about using clip: true in views slightly more prominent.Martin Jones2010-04-163-3/+3
| | | |/ / / / / / | | |/| | | | | |
generated by cgit v0.12 at 2025-02-07 18:00:36 (GMT)