| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
| |
the information is redundant now
Change-Id: Icc8c8b4ace11538d45c6c9e1dbe5a7976f4743e1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
instead of directly including the respective pri files in
*_dependencies.pri, set variables and let qtcreator.pri resolve
them to includes.
this will allow us to re-use the dependency info elsewhere.
Change-Id: Iaa33924e428ac0409660f42df2f98a7978452d3e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
| |
|
|
|
| |
Change-Id: I4025539f3875e79f03743ba9ed3fd09cd31b998d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
|
| |
|
|
|
| |
Change-Id: I25645bb625b467c6f9d895ff89a70acd6a25683e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
|
| |
|
|
|
|
|
|
|
|
|
| |
we don't support building 3rd party plugins against an installed qt
creator anyway (we don't install any headers), so it makes no sense to
install import libraries (especially into the wrong directory).
Task-number: QTCREATORBUG-8395
Change-Id: Ie6703598324d9dd39aa82d1eb0f2fecd224e4390
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@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>
|
| |
|
|
|
|
|
|
|
|
| |
"dll" and "shared" set each other, but too late to actually test for it
in the project files, so include both.
note that this will slightly modify the build of some of our imported qt
solutions.
Change-Id: I0bd4f41a68fd160f8e87eb0a0fa66096fe70ef3e
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@nokia.com>
|
| |
|
|
|
|
|
|
|
| |
we cannot figure out what this code was supposed to be good for, and it
actually breaks stuff, so let's remove it.
patch actually by maurice.
Change-Id: I18a80af4c8b49f2a29b86ca0c0d0a08632019339
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@nokia.com>
|
| |
|
|
|
|
| |
qtLibraryTarget is only defined if used with TEMPLATE=lib, which makes
it fail in pri files that are used for app pro files. The tests still
don't run because of run time linking issues.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Precompiled headers are a performance feature supported by some
compilers to reduce the (re-)compilation time substantially.
Usage in Qt: http://doc.qt.nokia.com/4.7/qmake-precompiledheaders.html
Due to the usage of precompiled headers Qt without demos/examples/webkit
etc might be compiled even faster than Qt Creator on some systems.
Despite of Qt, Qt Creator consist of mostly quite small subprojects
(plugins and libraries) where the effect would not be so noticeable
but still will be visible.
This patch adds default precompiled headers to any plugin and library
(i.e. by changes in src/qtcreatorplugin.pri and src/qtcreatorlibrary.pri
respectively). Almost the same headers are included to general
precompiled header (src/shared/qtcreator_pch.h) like used in QtCore,
just QPointer/QScopedPointer etc and QDebug are added, it is used almost
in any subproject. Also for plugins some QtGui related headers are added
(src/shared/qtcreator_gui_pch.h).
Default precompiled headers are enabled so:
isEmpty(PRECOMPILED_HEADER):PRECOMPILED_HEADER = $$PWD/shared/header.h
So it is possible to override this variable in any place in the project
file in case if it will be needed.
Such overriding is used for Botan (src/libs/3rdparty/botan) - it is
not a Qt project, just a pure C++. Most usable headers were used to
create special precompiled header for Botan. It is 3rd party component
so also src/libs/3rdparty/precompiled_headers folder was created -
to use for any future 3rd party components' precompiled headers.
To enable a usage of precompiled headers feature in Qt projects
'precompile_header' has to be added to CONFIG. It is done by default
for limited platforms only (e.g. not for Linux now), so to enable it on
any other platform - e.g. special qmake command has to be used:
qmake "CONFIG *= precompile_header" -r ../../qt-creator/
To disable a usage of precompiled headers (on platforms where it is
pre-enabled - otherwise it will be used automatically):
qmake "CONFIG -= precompile_header" -r ../../qt-creator/
To see on which platforms precompiled headers feature is enabled
by default - qt/mkspecs folder has to be checked.
Precompiled headers require an additional space on the disk, it looks
like for Qt Creator full size of the shadow build folder grows up to
2 times (e.g. 1.5 GB to 3 GB).
Test results:
Linux x64, gcc 4.4, T7500, 3 GB RAM: About 22.5 minutes are reduced
to about 14 minutes (almost 80% faster).
Windows x86, vs2008, P8400, 2 GB RAM: About 70 minutes are reduced
to about 20 minutes (amazing 250% faster).
Merge-request: 2182
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
|
|
| |
Reviewed-By: Oswald Buddenhagen
|
| | |
|
| |
|
