Necessary for keeping compatibility within a minor series.
When bumping versions, the compatVersion now needs to be taken into
account too.
Change-Id: I588947f885480889ff2f58481f72db76e3f1a9f1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@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>
numerous "3rdparty" libraries have respective #ifdefs, and consequently
the define is added in several places. it's quite a mess with the .pr?
and .qbs files, though. solve the problem by sidestepping it.
Change-Id: I5a6b1ba7cfe96b44f0a4f4ef9738900906a44316
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
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>
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>
"Project WARNING: CONFIG+=qtestlib is deprecated. Use QT+=testlib
instead."
Change-Id: Ia6dcce078736cac0f0b05e0f621a25f97c9dac87
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
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>
$$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>
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>
Because the change depends on reverted commit
c29bf6f652
This reverts commit 550f8218de.
Change-Id: If287c4b126b1ef710c074fd85946da41161c6ba9
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>
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>
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>
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>
- QtQuick1 renaming.
- Start on qtconcurrent split (pending renaming of Qt Creator's
qtconcurrent library).
- QWinEventNotifier is a public class in Qt 5.
- Metatype system: Classes need to be known.
Change-Id: I5582e7cc2777bf791a08b049262217055769c80f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Make Qt Creator compile with Qt 5 after using fixqt4headers.pl.
Change-Id: I74ca51d562f49378b40103b79848f5dd3b11e77e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
