Commit Graph

67 Commits

Author SHA1 Message Date
Eike Ziller
89c2b2cd32 Support make install also on OS X
It can be helpful, is not much effort, and parts did not restrict the
install target to non-OS X already.

Change-Id: I3501f37f089e981cf3f72d9250c9b9161d1565d6
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-04-22 06:46:11 +00:00
Eike Ziller
9dd84323df Use variables for install locations
Define variables in qtcreator.pri for the various
install locations, instead of hardcoding the paths
everywhere where they are needed.

Change-Id: Ia34de711a7f2be317272ede023e2a8b9cdcc30fe
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-09-22 12:16:08 +00:00
Leena Miettinen
0d9b254840 Doc: remove support for building docs with Qt 4
The templates are fetched from qtbase/doc/global

Change-Id: I15386a66e1dae552f5637062d9f176bf6565a834
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2014-11-24 09:48:26 +01:00
Oswald Buddenhagen
ca492c8fac use DISTFILES instead of OTHER_FILES in creator's own build system
it's the correct variable to use.

Change-Id: I9ec7795099097715a64969516cd3fae9e213a0f4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-15 12:10:01 +02:00
Christian Kandeler
847f10e9cc Remove Qt version checks.
Qt 5.3 is the minimum requirement these days. Remove all fallback code
from sources and project files.

Change-Id: If6188a471197acadda4d6baee71804ba1a8026c6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-08 10:33:25 +02:00
Eike Ziller
b5b6a46b4e ExtensionSystem: Use Qt 5 plugin metadata instead of .pluginspec files
Change-Id: I2b2c704260c613985a4bda179658ec1f8879e70f
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-02 15:11:24 +02:00
Eike Ziller
78b642eb0c Remove pre-Qt 5.3.1 code paths from main Qt Creator pro and pri files
Change-Id: I71bee691a2b9bad7dbdb4ca9c0a938d4313305f7
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-08-26 11:00:57 +02:00
Oswald Buddenhagen
cee04d9ac6 fix building against non-installed qt5 shadow builds
the global qdoc configs may live in the source dir, but the indexes are
always in the build dir.

this will obviously only work for a non-prefix (developer) build of qt,
as a non-installed prefix build is not usable from the outside.

Task-number: QTCREATORBUG-11919
Change-Id: I268af2f075a098ac5fe788a2f85c754dc6e4e8b0
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-27 10:12:52 +02:00
Leena Miettinen
34a643ac9e Doc: remove addressbook-sdk.qdoc from help dependencies
The file has been removed.

Change-Id: I8102eecb2a71a02166c670e4de4ebf48479ceff4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-03-25 15:41:18 +01:00
Kai Koehne
5bfe37c58c Add documentation for extensions of Qml Performance Monitor
Can be enabled by passing LICENSE_TYPE=enterprise to qmake.

Change-Id: I49044c2425a056980b6e9f8377e6a33c1beaca5a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-06-20 14:52:37 +02:00
Eike Ziller
f1741032a8 Add document about plugin manager/object pool.
Change-Id: I60d3a60f2a6933f9b1fe1501bab4dca95dda4d8c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-02 15:42:07 +02:00
Oswald Buddenhagen
853194370f use qt's qdoc templates when building against qt5
Change-Id: Id49e7808b0e8e83c54d573766fcb8c25bfe6728b
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-02-15 11:35:22 +01:00
Oswald Buddenhagen
276320caac make doc generation work cleanly with both qt4 & qt5
qdoc does not expand variables in include() statements, so we need to
use separate top-level "switch" files.

Change-Id: I3152baa36cb3dee055abdc68c046b445f92e1fb9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-02-06 09:40:03 +01:00
Oswald Buddenhagen
89efd76c2c de-duplicate qdoc command construction
Change-Id: I83de381cbbee9a04432aeccbb202a13f746ef97e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-02-05 12:38:24 +01:00
Kai Koehne
b481732389 Doc: Let 'make docs' also work without window manager
qhelpgenerator uses QtGuiWindow, but e.g. for build farms there's
no window manager available.

Change-Id: Id33af086ff86b0ee4778693a14da61832e360e7d
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>
2012-10-18 17:24:10 +02:00
Daniel Molkentin
745cb4b7ec Introduce $$QTC_PREFIX
'make install' now installs to $(INSTALL_ROOT)$$QTC_PREFIX/...

This is used for giving the contents of the 7zips an additional prefix.
(previously done by doing an additional copying step in bindistHelper).
QTC_PREFIX can also be used to give Qt Creator a different install path
at qmake time, and defaults to /usr/local on Linux.
On Windows and Mac there is no default for QTC_PREFIX.

Usage: qmake -r QTC_PREFIX=/qtcreator-2.6.0 && make &&
INSTALL_ROOT=/tmp/creator-dist make install

Change-Id: Id30781e14bfdde52531800f22b22e39f0459e806
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-09-25 10:14:51 +02:00
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