Change-Id: Iae22c2185fb0bde2509a0f6a9a975be4e7c2077c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: I97f84d16a092348332c18ad6ce34acc96d9a540f

Change-Id: Ic3a6cf5d4ddb16034e7ba86c95870feee0713b6a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: I8d00f000c618d1d781ca93efb3dd2fac60ab3507
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Change-Id: I86e238f87756e66fec1b8f3355ce289c55aa4f22
Reviewed-by: hjk <hjk121@nokiamail.com>

Change-Id: I2d49644b63bad9b7ffa7d088f443ed6ec2fc85ed
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

Change-Id: I2b6c5876cafb7cf19fc3040bc84fd88a90b6c0e0
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: I01a2e4c61e9bfcd4cb460a7c84949b848d67bac2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Qt5 will set the mmacosx-version-min to either 10.6 or 10.7, depending
on the mkspec used. These lines resulted in two mmacosx-version-min
flags, when libc++ is used (macx-clang-libc++ mkspec), this leads to
compiler errors. As Qt/qmake already adds the flag, there should not be
a need to set it in the .pri/.pro files.

Change-Id: Ib8cc59d2b064737aa0b5a889b2b3183eceaea1f3
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: Ifea253aaa719d020926a17498dc23b76134e0534

This corrects commit 112f80. $$QTESTLIB is not needed since both Qt4 and
Qt5 support "QT += testlib".

Change-Id: I776b44825295c86d2d85e9b8dc6a422da6f36ab6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

Change-Id: I978a6d435c53276a0f7a024e534278aa5f794ebb

"Project WARNING: CONFIG+=qtestlib is deprecated. Use QT+=testlib
instead."

Change-Id: Ia6dcce078736cac0f0b05e0f621a25f97c9dac87
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

Change-Id: Id0b100ae13cdd5edd82614c10bdf0cdeb45e6615

Change-Id: I864b1b500d385c91e3cac6725202ad7f48f11b17
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Change-Id: I6d9fe17cdddda9916ca5fd4da467c83cd14d4b75

It was doing more harm than it helped.

Change-Id: I670c4669f18ec0ed833bea6f7d5e9834c130210c
Reviewed-by: Daniel Molkentin <daniel@molkentin.de>
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>

waaaay faster than the hand-crafted ones

Change-Id: Ia4f60207b26a01752ca1eeddf1d8a76381cd1710
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

$$PWD is not really defined at this point. in qt4 it was the last value
assigned to it, while in qt5 it is just missing.

Change-Id: I4e70d234a7d5cee88e2d081b053e1ffa1070f788
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

Change-Id: I9e4f32135a36ab15888e2461c3ec599ea11c6dfd
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Change-Id: If3c1355c49d0447a012c034cc4ff05a80a604767

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 c29bf6f6

.

Change-Id: Ibb251150909271f3e119f05a1691832aae8ac633
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Because the change depends on reverted commit
c29bf6f6

This reverts commit 550f8218

.

Change-Id: If287c4b126b1ef710c074fd85946da41161c6ba9
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Change-Id: Ic6448d7ef95f4ff95df8fddd1b78f4071fa5118f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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: Id09e96eb96903c9a758848dbbea79259a624ef12
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Change-Id: Ibbd3568439e4ea3296afda92ad6b4507f622f9bd
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

Change-Id: I0e977f306e7398b9bd8b832be24b3ec2e6f3d67f
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Change-Id: I889b2f6a572bfc6083cd2129b51a18f5250699fd
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Qt Creator currently must compile with both Qt 4 and Qt 5, so we can't
change the code to call the non-deprecated functions that have been
recently deprecated in Qt 5, unless those functions already existed.

This change asks Qt 5 to enable the use of pre-5.0 API without warnings.

Change-Id: Ic165336f40d15fe5793d30bb9262986f738c984e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Change-Id: I6e79c827e777da29421933e9120c177687d4f783

Change-Id: I90f4aa43f1e6131607b6a0fea3150f5d208df458

Change-Id: I050e91370efd5c7fc5e6423126d5678743ed8002

Change-Id: I07864b42baa05722f65c317d63b60f74201c596e

Add either QtDeclarative (Qt 4) or QtQuick1 (Qt 5) to QT.
Mixing them leads to problems with include paths and linking.

Change-Id: I188240641216ee227931a7be2105bc4838385c79
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

Change-Id: I1faf14a5ef42af2dcfdf4bad3785901863d9d82b
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

Change-Id: I3dd7939a388f67a5addb4313032f182e9672caf1
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

This hack was needed because of QTBUG-6150 which was fixed in Qt 4.7.4.
Since Qt Creator already requires Qt 4.7.4 it not useful anymore.

Change-Id: If1f195b1dfc750d195dbb83c59794104935016be
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

It causes a conflict with the new QtConcurrent library
of Qt 5 and is quite small.

Change-Id: Ib97ab6daf8f67a88300cf03f044ba3593a4cd270
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>