summaryrefslogtreecommitdiffstats
path: root/qmake/generators/makefile.cpp
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2014-11-28 19:47:55 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-02-02 11:14:27 +0000
commitafd40dd12393e1b02776a835b17598d27db113a0 (patch)
treeeeb173aed74ca865fde824b48efa51e453c479eb /qmake/generators/makefile.cpp
parent44fca87241e457bcb7f7ebd81eb7ae6d7b7f7868 (diff)
avoid direct use of QLibraryInfo as much as possible
Change-Id: Ic1f5f5167181b15bc67bf4c6a1001532d0058b45 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'qmake/generators/makefile.cpp')
-rw-r--r--qmake/generators/makefile.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index a9f22d8597..cb6da72cba 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -45,7 +45,6 @@
#include <qhash.h>
#include <qdebug.h>
#include <qbuffer.h>
-#include <qsettings.h>
#include <qdatetime.h>
#if defined(Q_OS_UNIX)
@@ -3144,7 +3143,7 @@ MakefileGenerator::pkgConfigPrefix() const
{
if(!project->isEmpty("QMAKE_PKGCONFIG_PREFIX"))
return project->first("QMAKE_PKGCONFIG_PREFIX").toQString();
- return QLibraryInfo::rawLocation(QLibraryInfo::PrefixPath, QLibraryInfo::FinalPaths);
+ return project->propertyValue(ProKey("QT_INSTALL_PREFIX")).toQString();
}
QString