summaryrefslogtreecommitdiffstats
path: root/doc/src/development
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Doc: Fixed broken links.David Boddie2010-12-171-5/+3
| | |_|/ | |/| |
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1716-18/+18
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * | Update copyright year to 2011.Jason McDonald2011-01-1016-17/+17
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-211-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix number of chapters in qtestlib tutorial. Fixed QStatusBar not to repaint itself too early QNAM HTTP: Fix missing error() signal Make it clear which security updates are needed for Visual Studio 2005.
| | * Fix number of chapters in qtestlib tutorial.Jason McDonald2010-12-211-1/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-10248 Reviewed-by: Trust Me
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-231-15/+14
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: src/s60main/newallocator_hook.cpp tools/runonphone/serenum_unix.cpp
| * | Fixed link to qtestlib-tools by adding link to qt-webpages.qdoc.Jerome Pasion2010-12-061-15/+14
| |/ | | | | | | | | | | | | Link is now linking to the gitorious project site. Task-number: QTBUG-15714 Reviewed-by: David Boddie
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-251-0/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp src/corelib/global/qglobal.h src/gui/kernel/qwidget_p.h src/gui/painting/qtextureglyphcache.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h src/plugins/qpluginbase.pri src/qbase.pri tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp tests/auto/qthread/tst_qthread.cpp 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/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * Localize .loc and .pkg content based on TRANSLATIONSMiikka Heikkinen2010-11-121-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If developer specifies "CONFIG += localize_deployment" in .pro file, the generated .loc and .pkg will now use translatable strings from .ts files defined in TRANSLATIONS. The .ts files must have an underscore and Qt language code at the end of the filename body to be compatible with deployment localization. E.g. myapp_en.ts. Running lupdate will generate these entries into .ts files: - Application short caption - Application long caption - Package name - Smart installer package name Task-number: QTBUG-13917 Reviewed-by: Oswald Buddenhagen Reviewed-by: Janne Anttila Reviewed-by: axis
| * Implement support for DEPLOYMENT.display_name in SymbianMiikka Heikkinen2010-11-081-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default package name and the default name that appears in the application menu is derived from the TARGET variable. Often the default is not optimal for displaying to end user. To set a better display name for these purposes DEPLOYMENT.display_name variable can now be used. Cherry picked to 4.7 branch from master branch as part of QTBUG-15068, original commit: 9cb24d1c4b7359ec84708ba770050de720b50cdf Task-number: QTBUG-15068 Task-number: QTBUG-14280 Reviewed-by: Janne Anttila
| * Added .flags modifier support for DEPLOYMENT items in SymbianMiikka Heikkinen2010-11-081-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The .flags modifier can be used to specify pkg flags for files. For example, to make default application run after install: default_bin_deployment.flags += FR RI For example, to show a note at installation time: notedep.sources = install_note.txt notedep.flags = FT TC DEPLOYMENT += notedep See Symbian package file format documentation for exact supported flag values. Cherry picked to 4.7 branch from master branch as part of QTBUG-15068, original commit: 50b2477e6ffd64a0730cc5c0f0a6190b1a6b5861 Task-number: QTBUG-15068 Task-number: QTBUG-13367 Reviewed-by: Janne Anttila
| * Make default application deployment removableMiikka Heikkinen2010-11-081-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default application deployment was hard coded in qmake, so it was impossible to replace with custom deployment. Now the default deployment is generated via .prf files and is removable. Cherry picked to 4.7 branch from master branch as part of QTBUG-15068, original commit: 494ce0dac35c7ade0ce78589878597a7ca912864 Task-number: QTBUG-15068 Task-number: QTBUG-13367 Reviewed-by: axis Conflicts: qmake/generators/symbian/symbiancommon.cpp
| * Allow pkg_prerules and pkg_postrules to be targeted to separate filesMiikka Heikkinen2010-11-081-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pkg_prerules and pkg_postrules can now be targeted to apply only to main template pkg, installer pkg, or stub pkg file using .main, .installer, or .stub suffix on the variable. Also clarified documentation of these variables. Cherry picked to 4.7 branch from master branch as part of QTBUG-15068, original commit: a537137fffd72d153a35828228c00567a563e787 Task-number: QTBUG-15068 Task-number: QTBUG-13159 Reviewed-by: axis Conflicts: doc/src/development/qmake-manual.qdoc doc/src/snippets/code/doc_src_qmake-manual.qdoc
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-051-32/+124
|\ \ | |/ | | | | | | | | Conflicts: mkspecs/features/symbian/symbian_building.prf src/network/access/qhttpnetworkconnectionchannel.cpp
| * Doc: using pointer member variables and language changeLeena Miettinen2010-11-031-32/+124
| | | | | | | | | | Reviewed-by: Friedemann Kleint Reviewed-by: Martin Smith
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-252-16/+17
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-151-9/+18
| |\
| * | Doc: Reorganized the platform and compiler notes pages.David Boddie2010-10-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Errors and omissions will be fixed in later commits. The idea here is to merge the compiler notes into the platform notes because the platform is usually fixed and the compiler is often determined by the platform. In addition, notes about compilers are not always applicable to multiple platforms, so collating notes by compiler does not save much space, and it only makes maintenance of the notes more difficult.
| * | Doc: Fixed warnings caused by an earlier change. Made docs consistent.David Boddie2010-10-071-1/+1
| | | | | | | | | | | | Related to change f447ae026637a75d565e9347eb19f33d09557039.
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-071-3/+4
| |\ \
| * | | Doc: Re-added a link to the Qt site related to testing tools.David Boddie2010-10-071-12/+13
| | | |
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-2516-92/+102
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/snake/snake.qml qmake/generators/symbian/symbiancommon.cpp src/network/access/qnetworkaccessmanager.cpp src/s60installs/s60installs.pro tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * | | Doc: Fixing doc bugs for the symbian platformMorten Engvoldsen2010-10-141-9/+18
| | |/ | |/| | | | | | | Task-number:QTBUG-10925
| * | Doc: correcting broken link to labsMorten Engvoldsen2010-10-071-3/+4
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-041-1/+1
| |\
| * | Doc: Fixed the in-repository licenses for the documentation.David Boddie2010-10-0416-80/+80
| | | | | | | | | | | | | | | | | | In the repository, we should always use the No Commercial license alongside the GNU Free Documentation License for documentation files.
* | | Implement support for DEPLOYMENT.display_name in SymbianMiikka Heikkinen2010-10-071-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default package name and the default name that appears in the application menu is derived from the TARGET variable. Often the default is not optimal for displaying to end user. To set a better display name for these purposes DEPLOYMENT.display_name variable can now be used. Task-number: QTBUG-14280 Reviewed-by: Janne Anttila
* | | Added .flags modifier support for DEPLOYMENT items in SymbianMiikka Heikkinen2010-10-071-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The .flags modifier can be used to specify pkg flags for files. For example, to make default application run after install: default_bin_deployment.flags += FR RI For example, to show a note at installation time: notedep.sources = install_note.txt notedep.flags = FT TC DEPLOYMENT += notedep See Symbian package file format documentation for exact supported flag values. Task-number: QTBUG-13367 Reviewed-by: Janne Anttila
* | | Make default application deployment removableMiikka Heikkinen2010-10-071-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | Default application deployment was hard coded in qmake, so it was impossible to replace with custom deployment. Now the default deployment is generated via .prf files and is removable. Task-number: QTBUG-13367 Reviewed-by: axis
* | | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-041-2/+5
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | 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-s60-public into ↵Qt Continuous Integration System2010-09-281-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-271-1/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-13988 Reviewed-by: TrustMe
| * | Doc: Added a note to qmake INSTALLS docsGeir Vattekar2010-09-221-0/+3
| |/ | | | | | | | | Task-number: QTBUG-3171 Reviewed-by: David Boddie
* | 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-221-6/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-211-6/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp
| | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-091-0/+2
| | |\
| | * \ Merge branch '4.7-oslo1' into 4.7-docA-Team2010-09-071-54/+55
| | |\ \
| | * | | Fixed spelling, broken links, and missing default values.Jerome Pasion2010-08-301-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Tasks: QTBUG-13271, QTBUG-13212, QTBUG-12321 Reviewer: David Boddie
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1.git into ↵Morten Engvoldsen2010-08-301-0/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc-4.7 Conflicts: doc/src/getting-started/examples.qdoc doc/src/index.qdoc
| | * | | | Fixed spelling/grammar error.Jerome Pasion2010-08-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed by: David Boddie Tasks: QTBUG-11926, QTBUG-10174
* | | | | | Doc: document QMAKE_PROJECT_NAMEJoerg Bornemann2010-09-211-5/+13
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also moved QMAKE_LN_SHLIB upwards to maintain alphabetical order. Task-number: QTBUG-3206 Reviewed-by: aep
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-101-51/+54
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf
| * | | | Ignore MAKEFILE variable for Symbian abld and sbsv2 builds.Miikka Heikkinen2010-09-081-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
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-241-0/+2
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-171-1/+1
| |\ \ \ | | | |/ | | |/|
| * | | Doc: Added a small note about using .pro files in SUBDIRS.David Boddie2010-08-171-54/+55
| | | | | | | | | | | | | | | | | | | | | | | | Details: Found while trying to fix example .pro files. Reviewed-by: Trust Me
* | | | Allow pkg_prerules and pkg_postrules to be targeted to separate filesMiikka Heikkinen2010-08-301-9/+28
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pkg_prerules and pkg_postrules can now be targeted to apply only to main template pkg, installer pkg, or stub pkg file using .main, .installer, or .stub suffix on the variable. Also clarified documentation of these variables. Task-number: QTBUG-13159 Reviewed-by: axis
* | | Doc: Updating pages and linking them to the overviews.Morten Engvoldsen2010-08-221-0/+2
| |/ |/|
* | doc: Changed some titles so lists of contents sort better.Martin Smith2010-08-101-1/+1
|/