Commit Graph

51 Commits

Author SHA1 Message Date
Eike Ziller
b56b1c7d59 Revert "Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT)."
It depends on and mixes in changes made in another change on gerrit
that is not merged, so it breaks the package build.

This reverts commit c29bf6f652.

Change-Id: Ibb251150909271f3e119f05a1691832aae8ac633
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-07 10:02:40 +02:00
Daniel Molkentin
c29bf6f652 Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT).
Reason: $INSTALL_ROOT is only meant to be used by packagers
to temporarily put the contents into a different location,
which is needed for fakeroot packaging.

QTC_PREFIX is not a qmake variable, and defaults to
/usr/local. On Windows the default prefix is "QtCreator",
since "make install" is expected to be used in
a packaging context only where either INSTALL_ROOT
should be used or QTC_PREFIX should be set to the
absolute destination path where e.g. an installer
generator will pick it up.

Change-Id: Ifa4950340e58e34726c53f5417adcc7b50828ce1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-05 16:37:42 +02:00
Marius Storm-Olsen
a5b4dca5c3 Make Qt Creator documentation link to online docs
Change-Id: I3f843831242929bd3e8427a56c8269c62c1812c1
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
2012-05-15 12:01:46 +02:00
Yuchen Deng
4f0170e5c4 Doc: Build fix for Qt5 compilation
Change-Id: Id09f218492ce2b82e1c7ceae6e9324e52972aeb1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-04-04 08:15:32 +02:00
Daniel Molkentin
0d573bc5b3 Docs: Install rules also for windows.
Change-Id: I086f50adace23b8ffd07b431af5d5612ee747d01
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-01-26 20:31:54 +01:00
Eike Ziller
855e4eac4f Add document on plugin life cycle.
Change-Id: Iec868cdb8158726d91bcece935a9d6269219c056
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2011-12-01 16:42:36 +01:00
Eike Ziller
9df405ba86 Add a document about plugin specs.
Mostly moved from the IPlugin API documentation,
and adapted and extended.

Change-Id: I9e71fd387d831dea4f650b64cd931b3043c7b4cf
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2011-11-28 15:37:10 +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
Oswald Buddenhagen
e61381faba turn doc installation into an explicit target
otherwise a "make install" without a prior "make docs" will fail.

we cannot make install depend on docs, because the docs target does not
(and cannot reasonably) have proper dependency tracking, so it would be
rebuilt on every install attempt.
we could make install depend on the presence of the docs files without
checking their timestamps, but that would be dirty.

Task-number: QTCREATORBUG-6245
Change-Id: I35a9b8110f8f12760a338b5b100d69e226d3c2e8
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2011-11-14 15:13:16 +01:00
Oswald Buddenhagen
7f94699d1f adjust fixnavi target to new source structure
Change-Id: I535ea5632492d1baeabe1a0a8be571d7fe9baba9
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-11-09 17:42:41 +01:00
Leena Miettinen
aafd49424a Doc: cannot specify a folder as a dependency
Change-Id: I3f3ac0c2cabb7b660ff6ab8646563190df29c499
Reviewed-on: http://codereview.qt-project.org/5639
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-09-27 16:46:37 +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
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
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
1660c3851c build dev docs in doc/html-dev instead of doc/api/html
Change-Id: I42c13004e6a80b27c0f1690c76b35a0d40cee6ad
Reviewed-on: http://codereview.qt.nokia.com/289
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-06-01 11:54:20 +02:00
Oswald Buddenhagen
71c6bddda1 integrate developer docs into the normal docs build
Change-Id: Ie94fe37f9025643c35c14a224661295e6c4c9a41
Reviewed-on: http://codereview.qt.nokia.com/288
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-06-01 11:51:39 +02:00
Oswald Buddenhagen
39368e7641 move install code where it belongs
make inst_qch_docs a separate "structure" to avoid confusion, and move
the .files assignment to that structure's initializer.

Change-Id: I896ccaabe701736ca82db31c189ed88a19d1e8ad
Reviewed-on: http://codereview.qt.nokia.com/284
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-06-01 11:50:52 +02:00
Leena Miettinen
769b2c234a Doc: add file for fixnavi 2011-04-08 17:02:09 +02: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
con
edeb415908 Merge remote branch 'origin/2.1' 2010-12-10 11:09:55 +01:00
Oswald Buddenhagen
1eae0c6bbf add fixnavi target for convenience 2010-12-08 16:28:52 +01:00
Oswald Buddenhagen
9532d4a345 dynamically replace creator version during build
... instead of running a sed script over a lot of files on each
version increment.
2010-11-03 17:47:41 +01:00
Daniel Molkentin
294dfd10a3 Adjust to changes in qdoc from Qt 4.7.
Reviewed-By: Leena Miettinen
2010-08-17 11:46:18 +02:00
Daniel Molkentin
c7db4a09c8 Sync doc style with Qt, introduce online version (make docs_online)
The spacing errors come from Qt, and should be fixed there.

Reviewed-By: Oswald Buddenhagen
2010-06-15 15:02:57 +02:00
Oswald Buddenhagen
0b52a873bd escape backslashes (or don't use them at all, resp.) 2010-05-26 19:35:21 +02:00
Oswald Buddenhagen
67c186abea less bizarre build command setup for windows 2009-11-24 20:43:58 +01:00
Oswald Buddenhagen
c13d934b37 macx: compile doc into the right directory instead of copying it later 2009-11-24 20:43:55 +01:00
Oswald Buddenhagen
6769c13e6e do not create invalid help files
afaik, this was a bizarre hack to make the install target work, so fix
it properly instead.
2009-11-03 18:20:43 +01:00
Daniel Molkentin
c6e9c041a7 Do not require QTDIR to be set.
Reviewed-By: Oswald Buddenhagen
2009-10-26 15:36:09 +01:00
Daniel Molkentin
bb01aa7365 Remove obsolete checks for qdoc3 < Qt 4.6. 2009-10-15 16:41:05 +02:00
con
52a0e51ae6 Add the documentation files to doc.pri for easy access. 2009-10-01 14:06:34 +02:00
Rohan McGovern
d5f763387d Workaround bug where documentation sometimes is not generated.
On Windows, for unknown reasons, qhelpgenerator.exe sometimes will
not generate the documentation if run directly from nmake.
Running it through an intermediate cmd seems to work.
So, do that.

Reviewed-by: Daniel Molkentin
2009-09-30 01:02:40 +10:00
con
c22e4c7628 It's "Qt Creator" and that should reflect in the App name on Mac. 2009-09-15 14:22:13 +02:00
Daniel Molkentin
f888f5df2d help: try to fix windows case for qdoc detection 2009-08-21 13:50:06 +02:00
Daniel Molkentin
a4ff2aa725 Find qmake in the right location for Qt 4.6+ 2009-08-21 12:52:54 +02:00
Oswald Buddenhagen
259197a500 clean up OS conditionals in project files 2009-06-03 20:54:59 +02:00
con
713105ad85 Some documentation. 2009-04-24 16:34:24 +02:00
dt
fe5b095018 Add qtcreator.qdoc and qtcreator.qdocconf to OTHER_FILES
This makes it easier to open them from inside qt creator.
2009-03-31 14:16:52 +02:00
con
a58e6f7e59 Fixes: Make qmake generate install target for docs 2009-03-13 10:31:30 +01:00
con
822d881019 Fixes: - Creator documentation on Mac 2009-01-27 12:42:29 +01:00
Daniel Molkentin
194175cce7 Fixes: make install workd
Details:  Make install works now, we just have to agree on layout
details and check for mac compatibility.

Also, plugins will carry no version in their filename anymore starting with
this commit. Versioning happens in the creators pluginloader using the pluginspec file.
2009-01-21 08:52:19 +01:00
Daniel Molkentin
0f20a20b4c Fixes: Implement make install target, Step 1
Details: Moving files so that the local layout corresponds to the layout pushed by make install.
Adjust Make target, modify the resource path of the loader to find the resources in the
right place. All pathes are still looked up relative to binaryPath(), libs are found via
relative rpath.
2009-01-21 08:52:19 +01:00
Daniel Molkentin
dc9ad66d36 Fixes: Regression for make docs on unix 2009-01-14 20:08:39 +01:00
Daniel Molkentin
86b70b6a98 Fixes: Refine fix for nmake doc issue 2009-01-14 19:39:11 +01:00
Daniel Molkentin
f60b69eb6e Fixes: make docs target with nmake 2009-01-14 19:21:23 +01:00
Daniel Molkentin
8ba0eb2148 Revert improper commit 2009-01-14 18:10:59 +01:00
Daniel Molkentin
3908528fe4 fix doc target. this does still not solve the problem that qdoc has to be build in release mode if you use windows. 2009-01-14 17:57:19 +01:00
Daniel Molkentin
8fd841c157 build docs on windows 2009-01-13 16:21:11 +01:00
Thorbjørn Lindeijer
2c74d01e94 Fixed 'make docs' lauching of qhelpgenerator
It assumed qhelpgenerator was in the path, though this isn't necessarily
the case. Use the absolute directory instead.
2009-01-08 13:50:24 +01:00
con
4501ee9ed5 Fixes: - Mac build (docs) and toplevel "make docs" target
RevBy:    - bjørn
2009-01-07 15:48:44 +01:00