| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
So Design Studio can build different documentation than Qt Creator
Change-Id: I078df39d36533a1659caac937ef869e4bf0c7a43
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Source and configuration files for each manual are now located in a
separate subdirectory, with common configuration files in doc/config.
doc
|_config
|_qtcreator
|_qtcreatordev
|_qtdesignstudio
Edit the config files accordingly.
Change-Id: Idc747a7c16e84f3e06add91234dc5fc908e64cc5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
So the same file can be used without adaptions in other projects (for
example Qbs).
Adds installation of the html documentation, which
should not hurt, or might even be preferable.
Change-Id: I8f6fbf072b348dfe13e54a5f2018ed6e24fc3a34
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Since we cannot directly use qt_docs.prf since it contains
various Qt specific details, adapt it for use in Qt Creator.
This can then be used e.g. by plugins that are not part of the
Qt Creator repository.
Change-Id: I87511cad74cbcae5cb58087e9a9386130d635aa9
Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
|
|
|
|
|
| |
Change-Id: Iba49e6fc6b1d857cc0f87b5bf833f42a4a8a976f
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
it's the correct variable to use.
Change-Id: I9ec7795099097715a64969516cd3fae9e213a0f4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I71bee691a2b9bad7dbdb4ca9c0a938d4313305f7
Reviewed-by: hjk <hjk121@nokiamail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
The file has been removed.
Change-Id: I8102eecb2a71a02166c670e4de4ebf48479ceff4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
|
|
|
|
|
|
|
| |
Can be enabled by passing LICENSE_TYPE=enterprise to qmake.
Change-Id: I49044c2425a056980b6e9f8377e6a33c1beaca5a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
|
|
|
|
|
|
| |
Change-Id: I60d3a60f2a6933f9b1fe1501bab4dca95dda4d8c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
| |
Change-Id: Id49e7808b0e8e83c54d573766fcb8c25bfe6728b
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I83de381cbbee9a04432aeccbb202a13f746ef97e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
'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>
|
|
|
|
|
|
|
|
|
|
| |
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 c29bf6f6525d435d69936576761b4a29102cd056.
Change-Id: Ibb251150909271f3e119f05a1691832aae8ac633
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I3f843831242929bd3e8427a56c8269c62c1812c1
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
|
|
|
|
| |
Change-Id: Id09f218492ce2b82e1c7ceae6e9324e52972aeb1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
| |
Change-Id: I086f50adace23b8ffd07b431af5d5612ee747d01
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
| |
Change-Id: Iec868cdb8158726d91bcece935a9d6269219c056
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
|
|
|
|
|
|
|
|
| |
Mostly moved from the IPlugin API documentation,
and adapted and extended.
Change-Id: I9e71fd387d831dea4f650b64cd931b3043c7b4cf
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
|
|
|
|
|
| |
Change-Id: Ic75775473cfb405cee5c53b2dc24144dba51a25c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Change-Id: I535ea5632492d1baeabe1a0a8be571d7fe9baba9
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Change-Id: I2c7a9bce7ee92c59f91fa41f732f3c90a9e100e3
Reviewed-on: http://codereview.qt-project.org/4886
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
|
|
|
|
|
|
| |
Change-Id: I25fef3d823915c1df424da1a6ec7b683d7d38d66
Reviewed-on: http://codereview.qt.nokia.com/1323
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
|
|
|
|
|
|
| |
Change-Id: I42c13004e6a80b27c0f1690c76b35a0d40cee6ad
Reviewed-on: http://codereview.qt.nokia.com/289
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
| |
|
|
|
|
|
|
| |
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.
|
|\ |
|
| | |
|
|/
|
|
|
| |
... instead of running a sed script over a lot of files on each
version increment.
|
|
|
|
| |
Reviewed-By: Leena Miettinen
|
|
|
|
|
|
| |
The spacing errors come from Qt, and should be fixed there.
Reviewed-By: Oswald Buddenhagen
|
| |
|
| |
|
| |
|
|
|
|
|
| |
afaik, this was a bizarre hack to make the install target work, so fix
it properly instead.
|
|
|
|
| |
Reviewed-By: Oswald Buddenhagen
|