diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-03-04 21:32:40 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-03-04 21:45:05 +0100 |
| commit | 96232be1466e8c059c270b611ce7c32997ff60a9 (patch) | |
| tree | 9bf47c0c2c84556415eee7f938a098ae7e542649 /qmake/generators/makefile.cpp | |
| parent | 8db8a34f07a2f8cbd06dc0b593886a13d52ae4b1 (diff) | |
| parent | fb8c95bac09910c4dfa476ab97c6206b2e94ee53 (diff) | |
Merge remote-tracking branch 'origin/api_changes'
Conflicts:
dist/changes-5.0.0
mkspecs/features/qt_module_config.prf
qmake/project.cpp
qmake/property.cpp
Change-Id: I6e4af40743a9aeff8ed18533a48036e332acc296
Diffstat (limited to 'qmake/generators/makefile.cpp')
| -rw-r--r-- | qmake/generators/makefile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 8544dce2fc..63367f116a 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -3174,7 +3174,7 @@ MakefileGenerator::pkgConfigPrefix() const { if(!project->isEmpty("QMAKE_PKGCONFIG_PREFIX")) return project->first("QMAKE_PKGCONFIG_PREFIX"); - return QLibraryInfo::location(QLibraryInfo::PrefixPath); + return QLibraryInfo::rawLocation(QLibraryInfo::PrefixPath); } QString |