diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 14:35:50 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 16:27:28 +0100 |
| commit | a15c3d086dafea83e4760f0b447be43d26b80697 (patch) | |
| tree | fd224a3f83942ff4c432e1e3a3f8583d14d6a11c /qmake/generators/makefile.h | |
| parent | 87abfd351af6309691d921ca0aef077d74df4732 (diff) | |
| parent | 397061a6a92db9f962360d5db96f69b315f93074 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
src/dbus/qdbusconnection_p.h
src/dbus/qdbusintegrator.cpp
src/dbus/qdbusintegrator_p.h
tests/auto/corelib/io/qdir/qdir.pro
tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
Change-Id: I3d3fd07aed015c74b1f545f1327aa73d5f365fcc
Diffstat (limited to 'qmake/generators/makefile.h')
| -rw-r--r-- | qmake/generators/makefile.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h index 3517e4f2d4..41b90eb500 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -187,6 +187,7 @@ protected: //for installs virtual QString defaultInstall(const QString &); + virtual QString installRoot() const; //for prl QString prlFileName(bool fixify=true); @@ -272,6 +273,9 @@ inline bool MakefileGenerator::noIO() const inline QString MakefileGenerator::defaultInstall(const QString &) { return QString(""); } +inline QString MakefileGenerator::installRoot() const +{ return QStringLiteral("$(INSTALL_ROOT)"); } + inline bool MakefileGenerator::findLibraries(bool, bool) { return true; } |