summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'qt-doc-team/4.8'Casper van Donderen2011-08-296-14/+70
|\ | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc tools/qdoc3/ditaxmlgenerator.cpp tools/qdoc3/generator.h tools/qdoc3/htmlgenerator.cpp
| * Doc: Added a note to Code Editor example docsGeir Vattekar2011-08-251-0/+26
| | | | | | | | | | Task-number: QTBUG-9004 Reviewed-by: David Boddie
| * Doc: QItemDelegate->QStyledItemDelegate in Star Delegate docsGeir Vattekar2011-08-251-12/+12
| | | | | | | | Task-number: QTBUG-9440
| * Doc: Added a link in Symbian Intro to Required CapabilitiesGeir Vattekar2011-08-241-0/+2
| | | | | | | | Task-number: QTBUG-8942
| * Doc: Added info on ordered targets for VS to qmake manualGeir Vattekar2011-08-241-0/+23
| | | | | | | | | | Task-number: QTBUG-11988 Reviewed-by: David Boddie
| * Doc: Small addition to the QML anchor layout docsGeir Vattekar2011-08-241-1/+6
| | | | | | | | | | Task-number: QTBUG-15514 Reviewed-by: David Boddie
| * Phase 1 of QTBUG-20412, the XML manifest fileMartin Smith2011-07-151-1/+1
| |
| * Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-06-095-24/+56
| |\ | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc examples/draganddrop/fridgemagnets/main.cpp examples/script/context2d/main.cpp
* | \ Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-08-191-2/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Fix non-ascii name issues in ICD. Compile fix for Symbian 5th and earlier fix copying webkit guide under windows Symbian: Fix backspace on empty lines of multiline textedits
| * \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-08-181-2/+6
| |\ \ \
| | * | | fix copying webkit guide under windowsOswald Buddenhagen2011-08-171-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | patch by Rob Tomek. Task-number: QTBUG-19155
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-08-192-26/+48
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Doc: Fixed qdoc warnings. Doc: Fixed qdoc warnings. Improved comment finding code. Added language information to the pure documentation parser. Doc: Fixes to Qt tutorial Fixed external link to DevNet Wiki. qdoc: Fixed a crash caused by accessing a null pointer. Doc: Fixed the example of an encoded URL in the class description. Doc: Added a copy of the online style images for the qdoc manual. Doc: Removed the Google Analytics script.
| * \ \ \ \ Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-08-081-0/+3
| |\ \ \ \ \
| * | | | | | Doc: Fixes to Qt tutorialGeir Vattekar2011-07-291-25/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Jerome Pasion
| * | | | | | Fixed external link to DevNet Wiki.Jerome Pasion2011-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into ↵Qt Continuous Integration System2011-08-183-5/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging: test: Fix `tst_qfiledialog' in a namespaced build Fix files that don't end with a newline character tests: Skip `qaudioinput' tests if there is no audio backend available tests: fixed crash of tst_qdialog tests: fixed crash of tst_qdialog Fix QString compares to "" Add test case name and drop parentheses for -datatags option. Adding QTDIR validation in tst_symbols autotest Disabled benchmarks referring to private headers. Fixed compile of tst_qscriptextensionplugin on some Windows configurations Add license header to printdatatags autotests Compile on symbian^3 Compile on Symbian^3. Added -datatags option to QTestLib Fixed failure of tst_qxmlquery::evaluateToReceiver
| * \ \ \ \ \ \ Merge remote-tracking branch 'review/master'Sergio Ahumada2011-08-183-5/+5
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Fix files that don't end with a newline characterSergio Ahumada2011-08-123-5/+5
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are cosmetic changes to files that do not end with a newline character. Change-Id: I5b3e270386a1ef1ea2c1f57a1de3f7e3a8a52f5a Reviewed-by: Rohan McGovern
* | | | | | | Improve documentation for QDeclarativeView::setSource()Keith Isdale2011-08-181-4/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add reference to tutorial on setting source file for QDeclarativeView. Make use of compiled example code that demonstrate using Qt Resources in calls to QDeclarativeView::setSource() . Task-number: QTBUG-20985 Reviewed-by: Alan Alpert
* | | | | | Merge branch 'master' of ../qt-qml-stagingMichael Brasser2011-08-1189-556/+3722
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtAaron Kennedy2011-08-0489-556/+3718
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qtbinding.qdoc
| | * | | | | Added -datatags option to QTestLibjasplin2011-07-261-0/+3
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing the -datatags option to a QTestLib program prints the available data tags to standard output. Data tags for each test function (f() in this case) are printed in four different ways depending on the presence of local and global data tags: Case 1: No tags: f() Case 2: Local tags only: f() local tag 1 f() local tag 2 ... Case 3: Global tags only: f() __global__ global tag 1 f() __global__ global tag 2 ... Case 4: Local and global tags: f() local tag 1 __global__ global tag 1 f() local tag 2 __global__ global tag 1 ... f() local tag 1 __global__ global tag 2 f() local tag 2 __global__ global tag 2 ... ... Reviewed-by: Rohan McGovern Task-number: QTQAINFRA-226 Change-Id: I14de203b586a0085b8efda8e62772711e44677d2
| | * | | | Doc: Added a link to the How to Learn Qt document.David Boddie2011-07-191-1/+2
| | | | | |
| | * | | | Doc: Fixed shader program snippet.David Boddie2011-07-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18982 Reviewed-by: Kim Motoyoshi Kalland
| | * | | | Doc: Fixed page step sizes in a snippet for QAbstractScrollArea.David Boddie2011-07-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20350
| | * | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-142-16/+0
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| | | * | | Remove broken link to Symbian.org documentation.Casper van Donderen2011-07-122-16/+0
| | | | | |
| | * | | | Doc: fix typoJoerg Bornemann2011-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | | Merge remote branch 'upstream/4.8'Jerome Pasion2011-07-083-5/+77
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/external-resources.qdoc
| | | * \ \ \ Merge remote branch 'origin/4.7' into qt-4.8-from-4.7Jani Hautakangas2011-07-042-5/+42
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/external-resources.qdoc src/gui/text/qtextlayout.cpp src/opengl/qwindowsurface_gl.cpp
| | | | * | | Update QtOpenGL section in Symbian platform notes.Jani Hautakangas2011-07-012-5/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20216 Reviewed-by: Laszlo Agocs
| | | * | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-06-2978-508/+3258
| | | |\ \ \ \
| | | * | | | | Provide the resetInternalData slot to cleanly reset data in proxy subclasses.Stephen Kelly2011-06-271-0/+35
| | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Direct subclasses of QAbstractItemModel are unnaffected as they can update internal data in a slot connected to the sourceModel's modelReset signal or layoutChanged signal. Rehabilitated for 4.8. Should be reverted again in Qt 5. Reviewed-by: gabi Merge-request: 694
| | * | | | | Committing the qt-webpages.qdoc file with the online linksJerome Pasion2011-07-041-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie <david.boddie@nokia.com>
| | * | | | | Preparing documentation package for 4.8-betaJerome Pasion2011-07-044-25/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -removed link to "What's New in Qt 4.7" -replaced online HTTP links with qhelp links -wrote material for "What's New in Qt 4.8" Reviewed by: David Boddie <david.boddie@nokia.com>
| | * | | | | Doc: Removed whitespace.David Boddie2011-07-011-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 01b3f508d1f7e9951baf60f487feadfa98ba4751)
| | * | | | | Doc: Added a simple introduction to Qt and fixed links.David Boddie2011-07-015-5/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 9ed61311bce15b8f1bb4b30ee9133f1a2355f41d)
| | * | | | | Doc: Removed non-ASCII characters from the documentation.David Boddie2011-07-011-6/+6
| | | |/ / / | | |/| | | | | | | | | | | | | | | (cherry picked from commit 1bd6f1bd280ee6e1ecd4de2291c8ccfb4d06b7a4)
| | * | | | Re-apply licenseheader text in source files for qt4.8Jyri Tahtela2011-06-277-77/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New files after previous license change round. Reviewed-by: Trust Me
| | * | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-06-245-11/+35
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/image/qpixmap_raster_symbian.cpp src/gui/image/qpixmapdatafactory.cpp src/gui/painting/qgraphicssystem.cpp src/gui/styles/qs60style.cpp src/network/bearer/qnetworkconfigmanager_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtOpenGLu.def src/s60installs/bwins/QtOpenVGu.def src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-06-202-24/+7
| | | |\ \ \
| | | * | | | Qmlshadersplugin examples added.Marko Niemelä2011-06-133-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example application for OpenGL shading language and QML. Added also a link from qml examples main documents labs section. Reviewed-by: Kim Gronholm
| | | * | | | Qmlshadersplugin API documentation enhancements.Marko Niemelä2011-06-132-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a link from qml element index, removed some unnecessary doc markings, added missing example image and some other minor fixes. Reviewed-by: Kim Gronholm
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-06-221-18/+23
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: trivial: fix typo in comment changelog docu update for QNX 6.5 get rid of anacronysm massive improvements for the QNX screen driver massive improvements for the QNX mouse driver massive improvements for the QNX keyboard driver disable the Embedded Linux data directory permissions check for QNX skip two subtests that are known to fail on QNX implement POSIX IPC based QLock, QWSLock and QWSSharedMemory backends implement POSIX IPC based QSystemSemaphore and QSharedMemory backends add a configure-time check for an IPC support make QProcess really work on QNX make the kernel attempt to emulate an instruction with a misaligned access use RoundRobin scheduler by default on QNX a major refactoring of the mkspecs tree for QNX buildfix for qmake
| | | * | | | | docu update for QNX 6.5Ritt Konstantin2011-06-211-18/+23
| | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1259 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-175-18/+54
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc examples/draganddrop/fridgemagnets/main.cpp examples/script/context2d/main.cpp
| | | * | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-06-082-24/+7
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (54 commits) Update internal state before emitting configurationChanged() signals. Fixed qmlshadersplugin manual test shaders on SGX family GPU:s. Fixed qmlshadersplugin on windows VC2008 toolchain. Reset input context in Symbian when another window is opened. KERN-EXEC 3 panic in QCoeFepInputContext::translateInputWidget() Close context menus during orientation change. Have -small-screen enabled in certain examples on Symbian always. Update Japanese translations. Revert some of "Make QMLViewer startup animation stop after a while" Fix for winscw QtGui.def Add private method for flushing the pixmap cache. QDeclarative: Fix QPerformanceTimer on Symbian Fix QTreeWidget autotest cases on Symbian/VGA Increase SSL readbuffer 1 -> 16 kB Fix pixel metrics for Symbian VGA devices Revert "Fix QNetworkConfigurationManager usage outside main thread first" Avoid buffer overrun in QMacPixmapData resizing Fix glyph metrics with QStaticText/Freetype/raster and light/no hinting Fix tst_QGraphicsItem::sorting() test case for Symbian Fix QHeaderView test case for VGA Symbian devices. ...
| | | | * \ \ \ Merge remote branch 'upstream/4.8' into qt-4.8-from-4.7Toby Tomkins2011-06-081-0/+11
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/styles/qs60style.cpp
| | | | * \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-312-24/+7
| | | | |\ \ \ \ \ | | | | | | |_|/ / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qtextengine.cpp src/gui/text/qtextengine_p.h src/gui/text/qtextlayout.cpp src/plugins/phonon/mmf/mmf.pro src/plugins/s60/5_0/5_0.pro tests/auto/qtextlayout/tst_qtextlayout.cpp
| | | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-272-24/+7
| | | | | |\ \ \ \ | | | | | | |_|/ / | | | | | |/| | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalAlignment and anchors.mirror properties