summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-1852-333/+584
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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-1752-333/+584
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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-161-1/+41
| | | | | | | | | | | | | | | Task-number: QTBUG-8108 Reviewed-by: Olivier Goffart
| | * Fixed parsing of inner labelled statements.Roberto Raggi2010-04-162-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * More QML doc consistency.Martin Jones2010-04-164-22/+22
| | |
| | * Doc: in QML use "real" and "enumeration", not "qreal" and "enum"Martin Jones2010-04-1611-22/+22
| | |
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-1621-252/+387
| | |\
| | | * Wait for debug clients asynchronously instead of blocking creation ofBea Lam2010-04-163-85/+57
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | * ResizeMode support for QGraphicsWidgets created with QDeclarativeViewJoona Petrell2010-04-162-88/+180
| | | | | | | | | | | | | | | | | | | | 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
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-168-11/+43
| | | |\
| | | * | Throw exceptions on programming errors for global functions.Warwick Allison2010-04-164-37/+49
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7897
| | * | | Doc: make note about using clip: true in views slightly more prominent.Martin Jones2010-04-163-3/+3
| | | |/ | | |/|
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-161-3/+3
| | |\ \
| | | * | Do not set a font pixel size of 0.Yann Bodson2010-04-161-3/+3
| | | | |
| | * | | Add parent property to TimerMartin Jones2010-04-161-0/+1
| | |/ / | | | | | | | | | | | | Task-number: QTBUG-9949
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-169-26/+72
| | |\ \
| | | * | CleanupAaron Kennedy2010-04-162-3/+3
| | | |/
| | | * Class documentation fixes for declarative.Michael Brasser2010-04-165-18/+62
| | | |
| | * | Avoid calling QGraphicsItem::setTransformOriginPoint() until neededMartin Jones2010-04-164-5/+36
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9772 Reviewed-by: Alexis
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-1715-53/+193
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: EABI and BWINS DEF file updates for Symbian Further RVCT4 fixes for Symbian Symbol visibility fixes for RVCT4 on Symbian Symbol visibility fixes for RVCT4 on Symbian Symbol visibility fixes for RVCT4 on Symbian Fixed automatic patching of self-signed packages Webkit got bigger, make it link again on armlink Set library path properly for all systems Make debugging floating point mistakes much easier. Simplify docs a bit Fix check for arm based systems Fix option(recursive)
| * | | EABI and BWINS DEF file updates for SymbianIain2010-04-168-46/+139
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | Further RVCT4 fixes for SymbianIain2010-04-162-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | More corrections to declarations to ensure symbol visibility is correct Task-number: QTBUG-9998 Reviewed-by: TrustMe
| * | | Symbol visibility fixes for RVCT4 on SymbianIain2010-04-1626-38/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RVCT 4 is far more strict with regards to symbol visiblity that RVCT 2.2, and will hide symbols unless all references have default visibility in the object files. Update the various places in Qt code where the symbol visibility was set incorrectly for DLL-based platforms (those that use __declspec(dllimport) and (dllexport). Note: QtWebkit and QtScript are fixed in different commits. Task-number: QTBUG-9903 Reviewed-by: Jason Barron (cherry picked from commit a7ded5708ce81a37404cc0db8de84521c2aa693d)
| * | | Symbol visibility fixes for RVCT4 on SymbianIain2010-04-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RVCT 4 is far more strict with regards to symbol visiblity that RVCT 2.2, and will hide symbols unless all references have default visibility in the object files. Update the various places in Qt code where the symbol visibility was set incorrectly for DLL-based platforms (those that use __declspec(dllimport) and (dllexport). Note: QtWebkit and other Qt modules are fixed in different commits. Task-number: QTBUG-9903 Reviewed-by: Jason Barron (cherry picked from commit b2271d364cdc26187e5f9113f4c1816f334e37a1)
| * | | Symbol visibility fixes for RVCT4 on SymbianIain2010-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RVCT 4 is far more strict with regards to symbol visiblity that RVCT 2.2, and will hide symbols unless all references have default visibility in the object files. Update the various places in Qt code where the symbol visibility was set incorrectly for DLL-based platforms (those that use __declspec(dllimport) and (dllexport). Note: Other Qt modules and QtScript are fixed in different commits. Task-number: QTBUG-9903 Reviewed-by: Jason Barron Janne Koskinen (cherry picked from commit 81837e43e3f966c1755e90eb65df6e3bad506ed7)
| * | | Webkit got bigger, make it link again on armlinkThomas Zander2010-04-161-1/+4
| | | |
| * | | Set library path properly for all systemsThomas Zander2010-04-161-1/+2
| | | | | | | | | | | | | | | | This makes webkit link again on symbian/linux
| * | | Make debugging floating point mistakes much easier.Thomas Zander2010-04-161-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Its a common mistake that a floating point error, like divide by zero, is not detected and just propagated till it breaks in curious ways elsewhere. Like QBezier hitting an infinite loop due to operating on NaN floating points. Adding detection of this in a debug build of Qt is sure to help a lot of these issues be detected much faster and so Qt helps people write code even faster. Reviewed-By: Gunnar Sletta
| * | | Simplify docs a bitThomas Zander2010-04-161-1/+1
| | |/ | |/|
* | | Fix mismatched import declarationsThiago Macieira2010-04-171-1/+1
| | |
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-04-1660-265/+494
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/page/FrameView.cpp src/3rdparty/webkit/WebCore/rendering/RenderWidget.cpp src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtNetworku.def src/s60installs/eabi/QtGuiu.def tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-1536-46/+78
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Update EABI and BWINS DEF files for Symbian Update WebKit DEF files on Symbian Symbol visibility fixes for RVCT4 on Symbian Symbol visibility fixes for RVCT4 on Symbian Symbol visibility fixes for RVCT4 on Symbian
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Iain2010-04-154-2/+41
| | |\ \
| | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-1529-41/+40
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Symbol visibility fixes for RVCT4 on Symbian Symbol visibility fixes for RVCT4 on Symbian Symbol visibility fixes for RVCT4 on Symbian
| | * | | | Update EABI and BWINS DEF files for SymbianIain2010-04-155-3/+35
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | | Update WebKit DEF files on SymbianIain2010-04-152-2/+3
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add/absent function with altered signature to BWINS DEF file. Correct ordinal numbering in EABI DEF file, it was broken and causing the build to fail. Reviewed-by: TrustMe
| | * | | Symbol visibility fixes for RVCT4 on SymbianIain2010-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RVCT 4 is far more strict with regards to symbol visiblity that RVCT 2.2, and will hide symbols unless all references have default visibility in the object files. Update the various places in Qt code where the symbol visibility was set incorrectly for DLL-based platforms (those that use __declspec(dllimport) and (dllexport). Note: Other Qt modules and QtScript are fixed in different commits. Task-number: QTBUG-9903 Reviewed-by: Jason Barron Janne Koskinen
| | * | | Symbol visibility fixes for RVCT4 on SymbianIain2010-04-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RVCT 4 is far more strict with regards to symbol visiblity that RVCT 2.2, and will hide symbols unless all references have default visibility in the object files. Update the various places in Qt code where the symbol visibility was set incorrectly for DLL-based platforms (those that use __declspec(dllimport) and (dllexport). Note: QtWebkit and other Qt modules are fixed in different commits. Task-number: QTBUG-9903 Reviewed-by: Jason Barron
| | * | | Symbol visibility fixes for RVCT4 on SymbianIain2010-04-1526-38/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RVCT 4 is far more strict with regards to symbol visiblity that RVCT 2.2, and will hide symbols unless all references have default visibility in the object files. Update the various places in Qt code where the symbol visibility was set incorrectly for DLL-based platforms (those that use __declspec(dllimport) and (dllexport). Note: QtWebkit and QtScript are fixed in different commits. Task-number: QTBUG-9903 Reviewed-by: Jason Barron
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-153-42/+60
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add translation context to qsTr() benchmark QtScript: Add autotest for enumeration of QMetaObject properties QNAM HTTP: Pipelining changes
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-153-42/+60
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNAM HTTP: Pipelining changes
| | | * | QNAM HTTP: Pipelining changesMarkus Goetz2010-04-153-42/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-wrote some code to improve pipelining efficiency. Greatly helps with combining into one TCP packet. Task-number: QTBUG-9894 Task-number: QT-3280 Reviewed-by: Peter Hartmann
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-154-2/+41
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixes auto-test failure for 9da13ea53aec6d841ba7f416531d6c52d4368df4. Fixes tooltips for QGraphicsProxyWidget.
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-154-2/+41
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixes tooltips for QGraphicsProxyWidget.
| | | * | | Fixes tooltips for QGraphicsProxyWidget.Yoann Lopes2010-04-154-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Help event was not propagated to the widget. Also fixes tooltip value propagation when setting it on the proxy or on the widget. Autotest included. Task-number: QTBUG-5349 Reviewed-by: bnilsen
| * | | | | '#' gets inserted to editor when changing FEP modesSami Merila2010-04-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is regression in QCoeFepInputContext::commitCurrentString. Recent member variable removal broke the existing functionality. Fixed by removing the orphaned return-statement. Task-number: QTBUG-9867 Reviewed-by: Alessandro Portale
| * | | | | ComboBox popuplist is not correctly layouted in fullscreen modeSami Merila2010-04-151-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is partial fix to issue 9913. Now combobox popup is correctly positioned with AVKON StaCon (Combined Status and Control Pane). Popup is centered onscreen in this case. Task-number: QTBUG-9913 Reviewed-by: Janne Anttila
generated by cgit v0.12 at 2024-10-25 02:30:41 (GMT)