Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-09-30 | 139 | -150/+206 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (27 commits) Revert "QDeclarativeDebugService: Add bc autotest" to get changes through staging. Doc clarification. Fallback to A8 text rendering on Mac when LCD smoothing is disabled Recreate Qt 4.7 branch QtDeclarative def files on top of changes made to Qt 4.7.1 Autotest that new "import Qt 4.7"s aren't added accidentally Document "import QtQuick 1.0" change Replace "import Qt 4.7" with "import QtQuick 1.0" Add test for Qt 4.7 module Replace all occurances of "Qt 4.7" with "QtQuick 1.0" Correct property type of PathAttribute::value in the docs. Register QtQuick 1.0 module. Remove unused AST node destructors. Fix crash when trying to append a null transform to QDeclarativeItem. Documentation. Documentation fix for Flickable (mark content properties as real, not int). QDeclarativeDebugClient: Fix gcc warning QmlDebugService: Check that there is a receiver before sending messages If a type is registered under several names, share the attached property object QmlViewer: Fix typo in comment QmlViewer: Fix assert on exit (Windows) ... | ||||
| * | Document "import QtQuick 1.0" change | Aaron Kennedy | 2010-09-29 | 2 | -0/+56 |
| | | | | | | | | Task-number: QTBUG-13799 | ||||
| * | Replace all occurances of "Qt 4.7" with "QtQuick 1.0" | Aaron Kennedy | 2010-09-29 | 137 | -150/+150 |
| | | | | | | | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones | ||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵ | Qt Continuous Integration System | 2010-09-28 | 2 | -1/+8 |
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix QFontMetrics::lineWidth() for fonts with defined point size Implemeting, exporting and autotesting QFont::lastResortFont() Fixed compile error on non-Symbian platforms. Fixed regression when typing in QTextControl based widgets on Symbian Fixed incorrect snippet in BLD_INF_RULES documentation Streamlined smart installer package creation | ||||
| * | Fixed incorrect snippet in BLD_INF_RULES documentation | Miikka Heikkinen | 2010-09-27 | 2 | -1/+8 |
| | | | | | | | | | | Task-number: QTBUG-13988 Reviewed-by: TrustMe | ||||
* | | Doc: Added lisence header to snippet | Geir Vattekar | 2010-09-28 | 1 | -0/+39 |
| | | | | | | | | (cherry picked from commit a21b6be2e97b2678111930bc04eaa843b42fa22b) | ||||
* | | Doc: Fixing QTBUG-13595 | Morten Engvoldsen | 2010-09-28 | 1 | -0/+3 |
| | | |||||
* | | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-09-24 | 1 | -15/+3 |
|\ \ | |/ | |||||
| * | QML Debugging: Documentation fixes | Lasse Holmstedt | 2010-09-24 | 1 | -15/+3 |
| | | | | | | | | | | | | | | Many things have changed with QML debugging in Qt Creator. Now docs simply refer to Qt Creator documentation. Reviewed-by: Leena Miettinen | ||||
* | | Doc: maintainance - fixing grammar and spelling | Morten Engvoldsen | 2010-09-23 | 2 | -26/+26 |
| | | |||||
* | | Doc: Added a note to qmake INSTALLS docs | Geir Vattekar | 2010-09-22 | 1 | -0/+3 |
| | | | | | | | | | | Task-number: QTBUG-3171 Reviewed-by: David Boddie | ||||
* | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Geir Vattekar | 2010-09-21 | 1 | -0/+1 |
|\ \ | |||||
| * | | Doc: Fixing overlapping text problem in columns | Morten Engvoldsen | 2010-09-20 | 1 | -0/+1 |
| |/ | |||||
* | | Doc: Added info on QWidget::render to printing docs | Geir Vattekar | 2010-09-20 | 2 | -0/+65 |
|/ | | | | | Task-number: QTBUG-2210 Reviewed-by: David Boddie | ||||
* | Doc: css fine tuning | Morten Engvoldsen | 2010-09-17 | 1 | -3/+3 |
| | |||||
* | Merge branch '4.7' into friday | Morten Engvoldsen | 2010-09-17 | 135 | -192/+632 |
|\ | |||||
| * | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-09-16 | 134 | -181/+613 |
| |\ | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-09-15 | 4 | -6/+65 |
| | |\ | |||||
| | * | | Doc: Further QML improvements. | David Boddie | 2010-09-15 | 4 | -0/+53 |
| | | | | |||||
| | * | | Doc: Minor improvements to QML-related documentation. | David Boddie | 2010-09-15 | 2 | -5/+4 |
| | | | | |||||
| | * | | Doc: Continued work on the QML documentation. | David Boddie | 2010-09-14 | 2 | -0/+87 |
| | | | | |||||
| | * | | Doc: More work on the QML documentation. | David Boddie | 2010-09-14 | 126 | -126/+268 |
| | | | | |||||
| | * | | Doc: Some editing and tidying up. | David Boddie | 2010-09-13 | 3 | -51/+9 |
| | | | | |||||
| | * | | Doc: Added a missing file. | David Boddie | 2010-09-13 | 1 | -0/+193 |
| | | | | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-09-16 | 6 | -133/+127 |
| |\ \ \ | |||||
| | * | | | Doc: Updated What's new in 4.7 page | Geir Vattekar | 2010-09-16 | 1 | -1/+68 |
| | | | | | | | | | | | | | | | | | | | | Reviewed-by: Henry Haverinen | ||||
| * | | | | Merge branch '4.7' of ../qt-doc-team into 4.7 | David Boddie | 2010-09-14 | 8 | -270/+347 |
| |\ \ \ \ | |||||
| * | | | | | small fixes on the modelview tutorial | Roland Wolf | 2010-09-08 | 1 | -11/+19 |
| | | | | | | |||||
* | | | | | | Doc: Updated What's new in 4.7 page | Geir Vattekar | 2010-09-16 | 1 | -1/+68 |
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Henry Haverinen | ||||
* | | | | | | Doc: fixing creator bug in page footer | Morten Engvoldsen | 2010-09-16 | 1 | -1/+8 |
| | | | | | | |||||
* | | | | | | Doc: fixing issues with table indent - css | Morten Engvoldsen | 2010-09-16 | 1 | -3/+3 |
| | | | | | | |||||
* | | | | | | Doc: Fixing style: line height, ol indent, coulmns (css3) | Morten Engvoldsen | 2010-09-16 | 1 | -16/+43 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Geir Vattekar | 2010-09-16 | 4 | -134/+58 |
|\ \ \ \ \ | |||||
| * | | | | | Doc: Cleaning up the known issues page. Pointing people to check the online ↵ | Morten Engvoldsen | 2010-09-16 | 1 | -120/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | resources. | ||||
| * | | | | | Added a QFormLayout snippet to the layout.qdoc and layouts.cpp | Jerome Pasion | 2010-09-16 | 2 | -5/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie Tasks: QTBUG-10077 | ||||
| * | | | | | Doc: Removing section about Multimedia - playback and declarative elements. ↵ | Morten Engvoldsen | 2010-09-16 | 1 | -9/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | This was descoped from Qt 4.7. | ||||
* | | | | | | Doc: Updated the Mac requirements page. | Geir Vattekar | 2010-09-16 | 1 | -0/+3 |
|/ / / / / | | | | | | | | | | | | | | | | Reviewed-by: Morten Engvoldsen | ||||
* | | | | | git Merge branch '4.7-upstream' into 4.7-doc | Jesper Thomschutz | 2010-09-15 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | | Conflicts: src/gui/kernel/qgesturemanager.cpp | ||||
| * | | | Revert "Doc: fixing page name bug caused by ↵ | Morten Engvoldsen | 2010-09-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page" Doc: pulling back redundant fix that is breaking links - qmlelements.html/declarativeelements.html This reverts commit 064b7fe6f97bcf214f749794c5ccab3b4cf0bcc7. | ||||
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2010-09-10 | 100 | -998/+2788 |
|\ \ \ \ | |||||
| * | | | | Doc: Added info on compression to rcc docs | Geir Vattekar | 2010-09-10 | 1 | -1/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9946 Reviewed-by: David Boddie | ||||
| * | | | | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-09-09 | 99 | -997/+2767 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Ignore MAKEFILE variable for Symbian abld and sbsv2 builds. | Miikka Heikkinen | 2010-09-08 | 1 | -0/+2 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renaming makefile makes little sense for Symbian toolchains, when we generate so many other files filenames derived from other sources. Task-number: QTBUG-13336 Reviewed-by: Janne Anttila | ||||
| | * | | Document difference between property binding and assignment | Bea Lam | 2010-09-08 | 2 | -5/+62 |
| | |/ | | | | | | | | | | Task-number: QTBUG-12629 | ||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-09-07 | 4 | -14/+17 |
| | |\ | |||||
| | * \ | Merge branch '4.7' into qmldocs | David Boddie | 2010-09-07 | 5 | -28/+55 |
| | |\ \ | |||||
| | * | | | Doc: More work on the QML documentation. | David Boddie | 2010-09-07 | 12 | -65/+407 |
| | | | | | |||||
| | * | | | Merge branch '4.7' into qmldocs | David Boddie | 2010-09-06 | 6 | -0/+60 |
| | |\ \ \ | |||||
| | * | | | | Doc: Worked on two more elements, replacing an image. | David Boddie | 2010-09-06 | 3 | -2/+2 |
| | | | | | | |||||
| | * | | | | Merge branch '4.7' into qmldocs | David Boddie | 2010-09-03 | 5 | -78/+29 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/declarative/qml-intro/basic-syntax.qml |