summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1David Boddie2010-02-106-26/+48
|\
| * Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-096-26/+48
| |\ | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoapanel_mac.mm src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
| | * Documentation: clarified RVCT support for SymbianGareth Stockwell2010-02-081-2/+3
| | | | | | | | | | | | | | | Task-number: QTBUG-8012 Reviewed-by: Iain
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-051-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Another fix for the non unified title+toolbar regarding text under icons My 4.6.2 changes Added my changes to changes file. Doc: Correcting image My changes for 4.6.2 My changelog for 4.6.2 My Changelog entries for 4.6.2 Add the QMAKE_FILE_EXT variable to extra compilers generation. Doc: Removed promisse to fix a problem Add some entries to the change log Change log updated Improve raster graphics system performance on Mac (second try). I10n/German: Update translations for 4.6.2 I10n: Use 'real' Linguist comments in Phonon::EnvironmentalReverb
| | | * Doc: Correcting imageMorten Engvoldsen2010-02-041-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing "Trolltech" to "Nokia" Task-number:QTBUG-7370 Reviewed-by:Trust me
| | * | Added support for smart installer package generation in SymbianMiikka Heikkinen2010-02-044-24/+45
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Smart installer packages bundle normal application sis with a bootstrap package that will download a smart installer when the package is installed. Smart installer in turn will download any dependencies of the application that are available on remote server, such as Open C, Qt, and QtWebkit packages, and install them Smart installer packages are generated when DEPLOYMENT.installer_header variable is defined in applicatoin .pro file. This commit is still missing properly signed bootstrap.sis package. Task-number: QTBUG-7908 Reviewed-by: Shane Kearns
* | | Merge branch 'qdoc-i18n'David Boddie2010-02-099-424/+1546
|\ \ \ | |/ / |/| |
| * | Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars.David Boddie2010-02-084-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation root in the qdocconf file now refers to the Chinese title for the Tutorials page. Modified qdoc's function to canonicalize titles so that it preserves characters that outside the range of ASCII letters and numbers. Reviewed-by: Trust Me
| * | Doc/qdoc: Converted encoding of ISO-8859-1 docs to UTF-8. Output UTF-8.David Boddie2010-02-084-423/+423
| | | | | | | | | | | | | | | | | | | | | We now write UTF-8 encoded XHTML and assume all pure documentation which isn't pure ASCII is now UTF-8 encoded. Reviewed-by: Trust Me
| * | Doc: Added Simplified Chinese documents and build rules for them.David Boddie2010-02-045-1/+1126
| | | | | | | | | | | | | | | | | | | | | Also updated qdoc's configuration reader so that we can put UTF-8 content in the .qdocconf files later. Reviewed-by: Trust Me
| * | Merge commit 'origin/4.6' into oslo1-masterRohan McGovern2010-02-016-8/+28
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qeventdispatcher_mac.mm src/gui/kernel/qt_cocoa_helpers_mac.mm src/gui/widgets/qmenu_mac.mm tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
* | | | doc: Fixed some qdoc warnings.Martin Smith2010-02-051-2/+0
| | | |
* | | | doc: Fixed some qdoc warnings.Martin Smith2010-02-051-23/+0
| | | |
* | | | doc: Fixed some qdoc warnings.Martin Smith2010-02-051-0/+24
| | | |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-041-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Use a shared QScriptEngine for debugger console command scripts Fix QtScript debugger hang/crash issue with updating locals model doc: Fixed some qdoc warnings. Always activate popup windows on show doc: Fixed some qdoc warnings. Add the QMAKE_FILE_EXT variable to extra compilers generation. Cocoa: Tool Windows steal focus from the main window qdoc3: Removed a debug output. Update QTestLib documentation with chart use case.
| * | | | Update QTestLib documentation with chart use case.Fabien Freling2010-02-041-0/+0
| | | | |
* | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-042-3/+3
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/assistant/simpletextviewer/findfiledialog.cpp qmake/generators/symbian/symmake.cpp tools/assistant/lib/qhelpgenerator.cpp tools/assistant/lib/qhelpsearchquerywidget.cpp translations/translations.pri
| * | | | Fixed the URL of known issues wiki page in docsMiikka Heikkinen2010-02-012-3/+3
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Changed the URL to be version independent. Task-number: QTBUG-7295 Reviewed-by: TrustMe
* | | | Remove obsolete OpenGL/ES CommonLite (fixed-point) supportRhys Weatherley2010-02-043-16/+11
| |/ / |/| | | | | | | | | | | Task-number: QTBUG-7683 Reviewed-by: Tom Cooksey
* | | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-016-8/+28
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | Conflicts: src/gui/kernel/qeventdispatcher_mac.mm src/gui/kernel/qt_cocoa_helpers_mac.mm src/gui/widgets/qmenu_mac.mm tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * Doc: Put the correct images with the D-Bus and Embedded Linux sections.David Boddie2010-01-281-2/+2
| | | | | | | | Reviewed-by: Trust Me
| * doc: Document the "Type" enum value as a const in variable.Martin Smith2010-01-281-0/+11
| | | | | | | | Task-number: QTBUG-7605
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-244-6/+15
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Fixed broken link. Doc: Added a warning about the Accelerated Graphics Driver example. Doc: Fixed installation information for Qt for Embedded Linux. fix copy-paste error minor optimization Autotest: add a test for allowing hostnames ending in dot Fix QUrl::toAce for domains with dot at end Fix NSCFNumber autorelease warning on Mac. Add a reference to adjustSize() from the size property Fix the parallel build of QtWebKit
| | * Doc: Fixed broken link.David Boddie2010-01-221-1/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Doc: Added a warning about the Accelerated Graphics Driver example.David Boddie2010-01-221-0/+3
| | | | | | | | | | | | | | | Task-number: QTBUG-7403 Reviewed-by: Trust Me
| | * Doc: Fixed installation information for Qt for Embedded Linux.David Boddie2010-01-222-5/+11
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Merge commit 'oslo1/master' into oslo1-masterRohan McGovern2010-02-0110-65/+50
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/getting-started/installation.qdoc src/gui/dialogs/qfiledialog_win.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/assistant/tools/assistant/helpviewer.cpp
| * \ \ Merge commit 'refs/merge-requests/388' of git://gitorious.org/qt/qt into ↵David Boddie2010-01-281-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration Conflicts: examples/dbus/dbus-chat/chat_adaptor.cpp examples/dbus/dbus-chat/chat_adaptor.h examples/dbus/dbus-chat/chat_interface.cpp examples/dbus/dbus-chat/chat_interface.h examples/dbus/remotecontrolledcar/car/car_adaptor.cpp examples/dbus/remotecontrolledcar/car/car_adaptor_p.h examples/dbus/remotecontrolledcar/controller/car_interface.cpp examples/dbus/remotecontrolledcar/controller/car_interface_p.h
| | * | | doc: Fix qmake-manual warn_on/warn_off referencesAdemar de Souza Reis Jr2009-12-031-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
| * | | | Merge branch 'master' into staging-1-masterPaul Olav Tvete2010-01-251257-1654/+2570
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/getting-started/installation.qdoc
| | * \ \ \ Merge branch '4.6'Thiago Macieira2010-01-213-5/+5
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | Conflicts: tools/assistant/lib/qhelpsearchquerywidget.cpp
| | * | | | Merge branch '4.6'Thiago Macieira2010-01-1819-149/+895
| | |\ \ \ \
| | * | | | | Doc: Cocoa is now the default Mac port.Morten Johan Sørvig2010-01-151-21/+19
| | | | | | |
| | * | | | | Merge branch '4.6'Thiago Macieira2010-01-131244-1316/+1396
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| | * \ \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-122-6/+23
| | |\ \ \ \ \ \
| | * | | | | | | Rename files in completer example since QDirModel is not used.Alexis Menard2010-01-081-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc updated for the example. Reviewed-by:TrustMe
| | * | | | | | | Merge branch '4.6'Thiago Macieira2010-01-088-25/+47
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/opengl.pro
| | * | | | | | | | Assistant: Add doucmentation for -rebuild-search-index option.ck2010-01-071-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | * | | | | | | | Merge branch '4.6'Thiago Macieira2009-12-267-58/+118
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/fancybrowser/main.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/bookmarkmanager.cpp
| | * | | | | | | | | Doc: remove obsolete Win9x stuff from the documentationminiak2009-12-225-23/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1627 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * | | | | | | | | Merge branch '4.6'Thiago Macieira2009-12-083-14/+11
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge commit 'oslo-staging-1/4.6' into master-mainlineRichard Moe Gustavsen2009-12-043-5/+7
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge branch '4.6'Thiago Macieira2009-12-026-31/+42
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/gui/dialogs/qfiledialog_win.cpp src/plugins/qpluginbase.pri src/qbase.pri tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
* | | \ \ \ \ \ \ \ \ \ \ Merge commit 'origin/4.6' into oslo1-masterRohan McGovern2010-02-011257-1594/+2525
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/deployment/deployment.qdoc doc/src/getting-started/installation.qdoc examples/assistant/simpletextviewer/findfiledialog.cpp examples/assistant/simpletextviewer/findfiledialog.h examples/assistant/simpletextviewer/mainwindow.cpp examples/webkit/fancybrowser/main.cpp src/corelib/global/qglobal.h src/gui/dialogs/qfiledialog_win.cpp src/plugins/qpluginbase.pri src/qbase.pri tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/compat/config.cpp tools/assistant/compat/config.h tools/assistant/compat/docuparser.cpp tools/assistant/compat/docuparser.h tools/assistant/compat/fontsettingsdialog.cpp tools/assistant/compat/helpdialog.cpp tools/assistant/compat/helpdialog.h tools/assistant/compat/helpdialog.ui tools/assistant/compat/helpwindow.cpp tools/assistant/compat/helpwindow.h tools/assistant/compat/index.cpp tools/assistant/compat/index.h tools/assistant/compat/lib/qassistantclient.cpp tools/assistant/compat/lib/qassistantclient.h tools/assistant/compat/main.cpp tools/assistant/compat/mainwindow.cpp tools/assistant/compat/mainwindow.h tools/assistant/compat/mainwindow.ui tools/assistant/compat/profile.cpp tools/assistant/compat/profile.h tools/assistant/compat/tabbedbrowser.cpp tools/assistant/compat/tabbedbrowser.h tools/assistant/compat/tabbedbrowser.ui tools/assistant/compat/topicchooser.cpp tools/assistant/compat/topicchooser.ui tools/assistant/lib/qhelpsearchquerywidget.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/assistant/tools/assistant/doc/assistant.qdocconf tools/assistant/tools/assistant/helpviewer.cpp tools/linguist/lupdate/main.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| * | | | | | | | | | | Assistant docs: Fix link.ck2010-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4607 Reviewed-by: David Boddie
| * | | | | | | | | | | QtHelp docs: Fix illegal namespace name.ck2010-01-212-2/+2
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5908 Reviewed-by: kh1
| * | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-204-8/+47
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-191-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Memory leak in native Toolbar cleanup in Cocoa Fix copyright year. Bump version to 4.6.2. Add skeleton changes file for 4.6.2. Add released version of 4.6.1 changes file for posterity. Designer crashes when previewing QMainWindow with native Toolbar on Mac
| | | * | | | | | | | | | Fix copyright year.Jason McDonald2010-01-191-1/+1
| | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-191-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Make the qWarnings in the animation API more useful. Fixed y-inverted pixmaps on N900. Fix X11/EGL builds using OpenGL ES 1.1 Fix Typo