Definitely avoid deploying Qt multiple times, since
this might be a reason for code signature verification on OS X bailing
out, claiming that files have been modified.
Change-Id: Ic45b6fd4af75a3b972aec8c0b4841f0ff4e7886d
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
The current random number of backslashes results in an RPATH of
'\RIGIN' in the binary. Use a different random number of backslashes
instead.
Change-Id: Ife0f1a9c7f65d9e83dc39e90cb150421755ebb2c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Qbs is nowadays disabled with Qt4 anyhow, so we can use the less
hacky Qt 5 methods
Change-Id: I9ce9391238b3597cc4b31e9f9f6647cec1a2496e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Apparently, function calls are not allowed there.
Change-Id: Iba5c093ec473eb89df4d046a218df6ec78d14c7c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
That is, the qbs command-line frontend that we build.
Task-number: QTCREATORBUG-12474
Change-Id: Ia21c24daa25fff5ffe2fe69d23bd6d30285eec9a
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Apparently, that is not allowed in Qt 4 and not recommended in Qt 5.
Change-Id: I4183935d40d1c96c8716562112a31338a2fe57ad
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
So far, we have only built the library, arguing that that's all
QtC needs from qbs. However, it turns out that it is useful to have
the qbs executable as well, e.g. if there is a problem and the
user wants to quickly compare the behavior of QtC and the
command line tool with the guarantee that they're using the exact
same qbs library.
Task-number: QBS-558
Change-Id: Iddf94a0b304467abee313bcd52e446f02156c98b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
And also in the qbs sub-project (for the qbs and qmake builds). This
becomes possible with the qbs submodule update that is part of this
patch.
Change-Id: I8347a8c04a52bcb0682f32d808fb61a90ef3ba72
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
They are not (arch-independent) resources.
Task-number: QTCREATORBUG-10074
Change-Id: If257dfc3a8a866003c84331409162699b162eb19
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Qml editor widgets were still linking against declarative
for qml type registering. Registering is no longer necessary
since they are no longer used in QML.
Also removes the unused qtcomponents.
qmlpuppet of course still links against declarative, but that's not run
in the same process.
Task-number: QTCREATORBUG-10273
Change-Id: Ied12d38d58da5ff3bc694905b84dcd76cbce03af
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
- under windows we had the problem that *.py needs to be registered and
even if we had it: a call with modified PATH variable resulted in
strange two PATH variables in the environment (not sure that this was
a problem of nmake or something else)
- added -u to get the output unbuffered
Change-Id: I9326a31fc39a95b61d92bb00549f536db04af985
Reviewed-by: Matti Paaso <matti.paaso@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
The file name pattern that is used for win/lin should only be used for
the resulting disk image, not the installer app itself
Change-Id: Ia0b41fd379faf093af71dc526f32a768552d5e2f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
The patching of imports and plugins is done automatically by macdeployqt,
we need to pass it the qml2puppet executable though.
Also add Qml2Imports to the qml(2)puppet's qt.conf.
Task-number: QTCREATORBUG-9136
Change-Id: I9cb21d104f4c0c42531facfc6bc92fa9663e95a9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Unlike mingw makefiles, system() actually always uses the real
host shell, so use the host OS instead of the makefiles' path
separator as the discriminator.
Change-Id: Iaba6fc76f469e75fadd9d07e0c9e1ac07016338c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
We want the qbs library and resources to be placed in
the canonical places when installing Qt Creator. This
also makes it necessary to change the location of the
respective files in the build directory.
Change-Id: I8e78ec5aa0e8b728ccca96d45a647c1488961ea0
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
The qbs DLL must end up in bin/ in order to be found by the plugin.
Change-Id: Ie81e7550aa51f3414d829c893ad03dcafcc9c7fc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
With that we can overwrite the default value which is not
needed in the build package for SDK case.
Change-Id: Ife33317a92149f812aafebf806743f3e322ead1d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Windows has a problem with "install" in the name. Use .bin on Linux like
before.
Change-Id: I4f887a8c0442cd9f0a17425f68a36a371ae9f6b7
Reviewed-by: Karsten Heimrich <karsten.heimrich@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 c29bf6f652.
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>
Use like this:
SIGNING_IDENTITY="My ID" make codesign
Change-Id: Id71547a7e5926c34b6dad22017b5005791419cf0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
