summaryrefslogtreecommitdiffstats
path: root/doc/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-04147-179/+355
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/code/doc_src_qmake-manual.qdoc src/corelib/arch/symbian/arch.pri src/declarative/graphicsitems/qdeclarativeflickable.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h tests/auto/qfontmetrics/tst_qfontmetrics.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-30139-150/+206
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (31 commits) QDeclarativeDebug: Make autotests more robust Add sendParentChangeNotification to QGraphicsItem Use setParentItem() instead of setParentItemHelper if componentComplete is true QDeclarativeDebugClient: Make sure status is consistent 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 ...
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-30139-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" changeAaron Kennedy2010-09-292-0/+56
| | | | | | | | | | | | | | | | Task-number: QTBUG-13799
| | | * Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-29137-150/+150
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
| * | | Added support for unsigned smart installer package creation in SymbianMiikka Heikkinen2010-09-301-0/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Make target "unsigned_installer_sis" can now be used to create unsigned smart installer sis. The contained application sis will also be unsigned. Task-number: QTBUG-13902 Reviewed-by: axis
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-282-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 documentationMiikka Heikkinen2010-09-272-1/+8
| | | | | | | | | | | | | | | Task-number: QTBUG-13988 Reviewed-by: TrustMe
| * | Doc: Added lisence header to snippetGeir Vattekar2010-09-281-0/+39
| | | | | | | | | | | | (cherry picked from commit a21b6be2e97b2678111930bc04eaa843b42fa22b)
| * | Doc: Fixing QTBUG-13595Morten Engvoldsen2010-09-281-0/+3
| | |
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-241-15/+3
| |\ \ | | |/
| * | Doc: maintainance - fixing grammar and spellingMorten Engvoldsen2010-09-232-26/+26
| | |
| * | Doc: Added a note to qmake INSTALLS docsGeir Vattekar2010-09-221-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.7Geir Vattekar2010-09-211-0/+1
| |\ \
| | * | Doc: Fixing overlapping text problem in columnsMorten Engvoldsen2010-09-201-0/+1
| | | |
| * | | Doc: Added info on QWidget::render to printing docsGeir Vattekar2010-09-202-0/+65
| |/ / | | | | | | | | | | | | Task-number: QTBUG-2210 Reviewed-by: David Boddie
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-281-15/+3
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qrasterizer.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/mainwindow.cpp
| * | QML Debugging: Documentation fixesLasse Holmstedt2010-09-241-15/+3
| |/ | | | | | | | | | | | | Many things have changed with QML debugging in Qt Creator. Now docs simply refer to Qt Creator documentation. Reviewed-by: Leena Miettinen
* | Allow fallback to fulltext search when keyword has not been found (remote).kh12010-09-271-1/+6
| | | | | | | | | | Task-number: QTBUG-12963 Reviewed-by: ck
* | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-09-22148-615/+1158
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (231 commits) Fixed compile warning on Windows. Fixed painter path drawing on FBO without stencil buffer. qmake: Make smart library merge architecture-aware Slovenian translation: some updates and fixes Fixed memory leak in Symbian when Options menu was launched. Fixed color of cosmetic pens when printing under Windows. Fixed infinite loop when loading jpeg without EOI from memory. Fixes QPen dash offset for OpenGL paint engines (1.x & 2.x). Added galician translation Support multisampled pbuffers under Windows. tst_qpixmapfilter: Fix compilation in namespace qtextcodec_symbian: Add few aliases Give a warning in QPixmap::handle() if pixmap is not X11 class. Make QStaticText honor QPainter::pen() for rich text on X11 w/raster Fix one hang of QNAM on Symbian. Update QtDeclarative def files Update QtGui def files Update QtCore bwins def file Fix Symbian def file for a9e5329168 Make build on Symbian ...
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-21148-615/+1158
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp
| | * Doc: css fine tuningMorten Engvoldsen2010-09-171-3/+3
| | |
| | * Merge branch '4.7' into fridayMorten Engvoldsen2010-09-17135-192/+632
| | |\
| | | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-16134-181/+613
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-154-6/+65
| | | | |\
| | | | * | Doc: Further QML improvements.David Boddie2010-09-154-0/+53
| | | | | |
| | | | * | Doc: Minor improvements to QML-related documentation.David Boddie2010-09-152-5/+4
| | | | | |
| | | | * | Doc: Continued work on the QML documentation.David Boddie2010-09-142-0/+87
| | | | | |
| | | | * | Doc: More work on the QML documentation.David Boddie2010-09-14126-126/+268
| | | | | |
| | | | * | Doc: Some editing and tidying up.David Boddie2010-09-133-51/+9
| | | | | |
| | | | * | Doc: Added a missing file.David Boddie2010-09-131-0/+193
| | | | | |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-166-133/+127
| | | |\ \ \
| | | | * | | Doc: Updated What's new in 4.7 pageGeir Vattekar2010-09-161-1/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Henry Haverinen
| | | * | | | Merge branch '4.7' of ../qt-doc-team into 4.7David Boddie2010-09-148-270/+347
| | | |\ \ \ \
| | | * | | | | small fixes on the modelview tutorialRoland Wolf2010-09-081-11/+19
| | | | | | | |
| | * | | | | | Doc: Updated What's new in 4.7 pageGeir Vattekar2010-09-161-1/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Henry Haverinen
| | * | | | | | Doc: fixing creator bug in page footerMorten Engvoldsen2010-09-161-1/+8
| | | | | | | |
| | * | | | | | Doc: fixing issues with table indent - cssMorten Engvoldsen2010-09-161-3/+3
| | | | | | | |
| | * | | | | | Doc: Fixing style: line height, ol indent, coulmns (css3)Morten Engvoldsen2010-09-161-16/+43
| | | |_|/ / / | | |/| | | |
| | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-09-164-134/+58
| | |\ \ \ \ \
| | | * | | | | Doc: Cleaning up the known issues page. Pointing people to check the online ↵Morten Engvoldsen2010-09-161-120/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resources.
| | | * | | | | Added a QFormLayout snippet to the layout.qdoc and layouts.cppJerome Pasion2010-09-162-5/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie Tasks: QTBUG-10077
| | | * | | | | Doc: Removing section about Multimedia - playback and declarative elements. ↵Morten Engvoldsen2010-09-161-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was descoped from Qt 4.7.
| | * | | | | | Doc: Updated the Mac requirements page.Geir Vattekar2010-09-161-0/+3
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Morten Engvoldsen
| | * | | | | git Merge branch '4.7-upstream' into 4.7-docJesper Thomschutz2010-09-151-1/+1
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | / | | | | |_|/ | | | |/| | Conflicts: src/gui/kernel/qgesturemanager.cpp
| | | * | | Revert "Doc: fixing page name bug caused by ↵Morten Engvoldsen2010-09-101-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.7Jerome Pasion2010-09-10100-998/+2788
| | |\ \ \ \
| | | * | | | Doc: Added info on compression to rcc docsGeir Vattekar2010-09-101-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9946 Reviewed-by: David Boddie
| | | * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-0999-997/+2767
| | | |\ \ \ \ | | | | |/ / /
| | * | | | | Clarified the coding standard regarding connecting signals to slots.Jerome Pasion2010-09-102-3/+15
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaned up the contradiction identified in QTBUG-10114. Reviewed-by: David Boddie Bug: QTBUG-8961, QTBUG-10114