feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
26,137 Commits 108 Branches 368 Tags
cf937f09d6fe7af170393942b116510dcd287815
Commit Graph

41 Commits

Author SHA1 Message Date
Eike Ziller
cf937f09d6 Avoid pulling in "Extending Manual" into Qt Creator manual. 
With Qt5, qdoc finds the doc/api/*.qdoc files if the examplesdir points
to doc/, leading to the two toplevel index.html files ending up within
qtcreator.qch

Change-Id: I4ac3c1447c6924c4e292024919d52ddb97e1f8cc
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
 2012-12-17 12:47:49 +01:00
Eike Ziller
8c4d86d174 Fix Qt Creator manual style when generating with Qt 5. 
The HTML.templatedir is no longer used in Qt 5. Instead, the files
are resolved relative to the referencing qdocconf.
So we set the templatedir to the path of the qdocconf (for Qt 4)
and change the references to be relative to that path.
Also, it's HTML.extraimages in Qt 5, instead of extraimages.HTML

Task-number: QTBUG-28304
Change-Id: I5b253ea9fac5825c49f74460df188a7fca5c89cd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2012-12-10 13:42:15 +01:00
Jerome Pasion
b28432648d Doc: Making the header consistent with Qt reference documentation. 
Change-Id: I2272f577b707ffd2f308924ba01b768c81decaa8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2012-10-23 12:23:52 +02:00
Eike Ziller
1504ca67fb More Nokia -> Digia/QtProject changes 
Change-Id: If52505dbc95ee48ac3467cdfbbea91629c11089c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-10-09 12:24:24 +02: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
Leena Miettinen
836a13a97d Doc: remove space from value of project variable 
This is a new qdoc requirement for the project variable in
qdocconf files.

Change-Id: I23d921bac68e3c2948c4193b08a60c756e258ccc
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
 2012-05-31 14:21:29 +02:00
Eike Ziller
9092e70884 Merge remote-tracking branch 'origin/2.5' 
Conflicts:
	doc/templates/style/style.css
	qtcreator.pri

Change-Id: I5f4f5f191726883dae18cb760733a5e8e6bd4e7d
 2012-04-27 17:02:39 +02:00
Leena Miettinen
56ed79050b Doc: add green icons for next and previous topics 
For the online style, now that the text is removed

Change-Id: I13b7da504abda0b395e25dbf6e6ec4bcf03f4ec8
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
 2012-04-27 11:47:12 +02:00
Leena Miettinen
fe9051fdff Doc: rename arrow image 
Change-Id: I999363adbe9a5c819bf25f8bdfa58bc3fa5eae04
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
 2012-04-27 11:46:57 +02:00
Casper van Donderen
8316cbe3f4 Doc: Add icons for previous and next page. 
Change-Id: Ic0f9836d9af2f9c683171a6cbdfd6e42ba1fe2a3
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2012-04-20 12:20:11 +02:00
Leena Miettinen
d880c74554 Doc: fix links to point to qt-project.org 
Change-Id: I3fd949a1b99422749aabb2548b2b57cd67b4971b
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
 2012-03-16 15:59:43 +01:00
Casper van Donderen
4ef89ffa03 Update the footer for qdoc output for qt-project. 
Change-Id: I7861fffebd07cab497faa71541117a1d686a5d60
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2012-03-13 18:03:51 +01:00
hjk
2931a499e6 Long live the king! 
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-26 19:55:36 +01:00
Leena Miettinen
d465f2e363 Doc: use macro for Qt Simulator product name 
Change-Id: I68b7d4d2d8a6ef62f3b09aaf114b1cde94cda63b
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
 2012-01-19 09:39:41 +01:00
Leena Miettinen
0d72da2fd4 Doc: style sheet for Qt Creator help files 
Change-Id: Ic030af03851e3c0d856029de807aa239a6e08b47
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Reviewed-by: Virva Auvinen <virva.auvinen@nokia.com>
 2011-12-22 13:55:34 +01:00
Eike Ziller
d0c0c0628d Start on Creating Plugins documentation. 
Change-Id: Ic75775473cfb405cee5c53b2dc24144dba51a25c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-11-28 14:52:04 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
 2011-11-11 09:46:25 +01:00
Oswald Buddenhagen
4a322099f5 remove double mention of $SRCDIR/src 
Change-Id: I4627ba8d3be024ab982088fa58ad63c58d086280
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-11-09 17:40:37 +01:00
Christian Kamm
a51120b7db QmlJS: Documentation. 
Change-Id: I2a095e38b7d79a5fb39a16d8f32b48c8e28132f6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-11-07 15:16:59 +01:00
Leena Miettinen
ecfef3c2e1 Doc: fix security issue in HTML template 
Change-Id: I2fbcb030195a9104eeba8b83037623103efdb5c0
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
 2011-10-28 13:16:57 +02:00
Leena Miettinen
35d81bb367 Doc: add and edit macros to remove emphasis for product names 
Change-Id: I077c721c661a2b9fa8dfbd93dd9888a8d700f5c5
Reviewed-on: http://codereview.qt-project.org/5603
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:53:45 +02:00
Leena Miettinen
af2cde64a8 Doc: change doc configuration after moving files to subdirectories 
Change-Id: I6df3222a92efed43ede601e3f2e6f71b75782d22
Reviewed-on: http://codereview.qt-project.org/5602
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
 2011-09-27 15:51:39 +02:00
Eike Ziller
b0efd44d20 Merge remote-tracking branch 'origin/2.3' 
Conflicts:
	qtcreator.pri
	qtcreator.pro
	share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
	src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
	src/plugins/remotelinux/remotelinuxruncontrol.cpp

Change-Id: I9c89ba9fa2928e14e148041f9001856dce47a20b
 2011-09-15 11:50:29 +02:00
Leena Miettinen
b67c3874b7 Doc: separate MeeGo and Maemo instructions 
Change-Id: I2c7a9bce7ee92c59f91fa41f732f3c90a9e100e3
Reviewed-on: http://codereview.qt-project.org/4886
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-09-14 17:08:32 +02:00
Eike Ziller
57ae91c5ef Merge remote-tracking branch 'origin/2.3' 
Conflicts:
	doc/qtcreator.qdoc
	qtcreator.pri

Change-Id: I8b34546dccc031aeeeab03417e9bd3aa7b740472
 2011-08-30 15:59:07 +02:00
Leena Miettinen
62ed51c3c8 Doc: replace dynamic links with fixed links 
Change-Id: Ib99ca3b9b93ca62ec4fa63aa03e99a2260d9cb78
Reviewed-on: http://codereview.qt.nokia.com/3080
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-08-19 12:02:11 +02:00
Robert Loehning
476338a6d2 Changed links to bugtracker to https 
Change-Id: I62aa9a4033399ee7fc0b55952613657f124c8fb9
Reviewed-on: http://codereview.qt.nokia.com/2791
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-08-10 13:44:03 +02:00
Leena Miettinen
63710f04ed Doc: generic Linux device target 
Change-Id: I25fef3d823915c1df424da1a6ec7b683d7d38d66
Reviewed-on: http://codereview.qt.nokia.com/1323
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-08 12:13:14 +02:00
Oswald Buddenhagen
1d78e594d8 Merge branch '2.2' 
Conflicts:
	qtcreator.pri
	share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp
	src/libs/qmljs/qmljsdocument.cpp
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/libs/qmljs/qmljslink.cpp
	src/plugins/cppeditor/cppquickfixes.cpp
	src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp
	src/plugins/qmldesigner/qmldesigner.pro
	src/plugins/qmldesigner/symbianplugin/symbian.metainfo
	src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h

Change-Id: Id5f754e2837a3bb3e0687ed09f1dda45fd0c5617
 2011-06-23 19:47:50 +02:00
Leena Miettinen
9426bbe0ae Doc: add version numbers to the doc titles 
Change-Id: I2b71cba2ab19a15a834976e3ce953e992ca4b124
Reviewed-by: David Boddie
Reviewed-on: http://codereview.qt.nokia.com/640
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-06-23 10:51:24 +02:00
Oswald Buddenhagen
8cabf8a20b fix shadow building of apidocs 
fix $OUTDIR and actually use it

Change-Id: Ic0bf2eb98997e3f8934cc574df5b5fd109bee473
Reviewed-on: http://codereview.qt.nokia.com/287
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-01 11:51:27 +02:00
Leena Miettinen
362d443422 Doc: add texteditor 
Change-Id: Ibd155903705e3ee1e238df7186905f666530cebd
Reviewed-on: http://codereview.qt.nokia.com/276
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-05-31 16:36:36 +02:00
Friedemann Kleint
00a0070483 Doc: Add documentation on how to write Wizards in code. 
Reviewed-by: Leena Miettinen <leena.miettinen@nokia.com>
Acked-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-05-10 16:51:02 +02:00
Leena Miettinen
1998afc41f Doc: add doc project for the Extending Qt Creator Manual 2011-04-27 17:35:58 +02:00
Leena Miettinen
f270578cb1 Doc: added FAQ 2011-04-04 11:29:42 +02:00
con
4bf6b02989 Fix Qt Creator version in documentation again. 2011-03-07 20:38:17 +01:00
Leena Miettinen
f0828d6114 Doc: change SDK name 2011-03-07 14:24:51 +01:00
David Boddie
fae31e0d25 Doc: Added a missing image, removed unnecessary search field. 2011-02-16 18:38:16 +01:00
David Boddie
42f742b858 Doc: Ensured that style and scripts are included in online docs. 2011-02-16 14:54:02 +01:00
Leena Miettinen
70b9c84381 Doc: fix for the online style 2011-02-15 15:57:47 +01:00
David Boddie
a20cd34863 Updated the configuration files to use the updated qdoc. 
Updated qdoc to remove hard-coded dependencies on style sheets.
Simplified the offline documentation, introducing an offline.css
file to be used for documentation in Qt Creator.
 2011-02-11 08:40:55 +01:00