Commit Graph

22 Commits

Author SHA1 Message Date
Eike Ziller
e724934393 Merge remote-tracking branch 'origin/4.2'
Conflicts:
	doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc
	doc/src/qtquick/qtquick-creating.qdoc
	doc/src/qtquick/qtquick-uiforms-tutorial.qdoc
	share/qtcreator/welcomescreen/qtcreator_tutorials.xml
	src/plugins/git/gitgrep.cpp
	src/shared/qbs

Change-Id: I6f4d168d888d9547c3af0819f79cc9ebb4186ca0
2017-02-14 15:32:04 +01:00
Leena Miettinen
3858d4c363 Doc: Add licenses to .qdocinc files
Change-Id: Ia20fe2605a6255af24d4334d8289531aaa262511
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-02-13 08:14:53 +00:00
Eike Ziller
20670d62ba Update requirements to GCC>=4.9
Change-Id: I34b5dcec552c0af0ce7184a43fa7fba4a75415c4
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-30 08:19:29 +00:00
Leena Miettinen
3ac78c5053 Doc: Update info about supported platforms
To match the info in README.md and Qt for Device Creation docs
(http://doc.qt.io/QtForDeviceCreation/qtee-installation-guide.html)

Change-Id: I9abd9808aad5fec5bee39204e7b4b0b43656141c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2017-01-17 12:59:46 +00:00
hjk
1e8ffa20d0 Doc: Introduce a macro \macos to adapt to upcoming renamings
Start with an initial value 'macOS' and use in uncontroversial
places in the docs. Some explicit references to older versions
are untouched in this patch.

Change-Id: Ibea4115c45fc2ff2c9a0518d92797df26fd4138f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-08-03 15:30:06 +00:00
Tobias Hunger
43800a6aa8 Update License according to agreement with Free Qt Foundation
* Update license in documentation files. Stay at FDL, but update
  URLs as well as license for examples, etc.

Change-Id: I5e8cb5a20f0e9d52fba1d937b7c73197d69dd747
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-19 13:09:03 +00:00
Leena Miettinen
78d304674f Doc: developing for embedded devices
Add information about Qt for Device Creation
integration with Qt Creator. Add links to the
Qt for Device Creation documentation where
appropriate.

Change-Id: Ie9be5a65697681590e2131407432f826a5ab4f2e
Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2015-08-26 11:24:24 +00:00
Eike Ziller
3c85058694 Update License
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2015-01-16 12:37:56 +01:00
Leena Miettinen
d59d8b568d Doc: replace "Mac OS (X)" with "OS X"
Change-Id: I77f1cbbfc17d759d1587caf2a25a53498848e2ca
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-05-06 09:35:45 +02:00
Leena Miettinen
9b2b011406 Doc: support for Mac OS X 10.6 was dropped
Change-Id: Ic9f13c5303f6caa14ca5b3279a7f7509b9e12b73
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-02 11:57:33 +02:00
Topi Reinio
627e2b4807 Doc: Use the page title for linking to index.html
Because the Qt Creator documentation depends on Qt reference
docs for linking, qdoc will generate a collision page for
index.html as it exists in both.

This change prevents linking to the collision page in the
navigation links by using the page title as the link target
instead of the file name.

Task-number: QTCREATORBUG-11035
Change-Id: I5638e09b60543dc2068b0e4a269f8f72d4655b48
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-03-17 14:53:01 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
Leena Miettinen
97804eeba6 Doc: update supported platforms topic
Qt Creator built against ANGLE is not supported on Windows XP,
so XP has been dropped. Windows 8 and 8.1 have been added.
On Windows, you need DirectX 9.0.

(K)Ubuntu Linux is now supported for version 11.10 on, and
Mac OS from version 10.6 on.

Change-Id: Icf6c042670b685d9c87db95aecb8b5e8f9d2a59b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-11-26 15:38:43 +01:00
Leena Miettinen
419c6de735 Doc: replace deprecated QDoc commands
The \i and \o commands were replaced with \li and
\bold was replaced with \b in QDoc for Qt 5.

The \input command was replaced with \include in the docs.

Change-Id: I257d1bebb8ebc739ca20e0d29fcf0406ecb14534
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-06 09:44:18 +01:00
Robert Loehning
298531e370 Incremented year in copyright info
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 16:27:03 +01:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00
Eike Ziller
4e9ce07142 Update supported Linux platforms
Change-Id: I5d20a615f6d03bf11528992984c2e3e8c7b35fc8
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-05-29 12:31:52 +02:00
Leena Miettinen
6696a9b0d0 Doc: change the copyright year to 2012
Change-Id: I31e5f412ec2d4c371382e00503b7ebf5cc57ba02
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
2012-01-26 12:33:30 +01:00
Leena Miettinen
88e29febba Doc: restructure doc according to developer workflow
Add and remove illustrations.
Add landing pages.

Change-Id: I927d62aee9dc43814ef7f4d7424a83eee2af156b
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
2011-12-13 13:55:34 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-03 10:33:19 +01:00
Leena Miettinen
44c107c267 Doc: move misc overview topics to a separate folder
Change-Id: I7bcf4edb2e23c669b000e08a1d6ce14b3982fd0d
Reviewed-on: http://codereview.qt-project.org/5610
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
2011-09-27 15:55:39 +02:00