35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
From 10dde2fe0b7d8fe9ca7b4aa21d351b5dc01341c0 Mon Sep 17 00:00:00 2001
|
|
From: Martin Jansa <Martin.Jansa@gmail.com>
|
|
Date: Sat, 27 Apr 2013 22:51:54 +0200
|
|
Subject: [PATCH 10/11] qmake/property: rename QT_INSTALL_CONFIGURATION to
|
|
QT_INSTALL_SETTINGS
|
|
|
|
* this variable is referenced from configure and configureapp.cpp as QT_INSTALL_SETTINGS
|
|
property.cpp was only place using name QT_INSTALL_CONFIGURATION
|
|
|
|
Upstream-Status: Submitted
|
|
https://codereview.qt-project.org/54912
|
|
|
|
Change-Id: I0f3c3b5c0527d22c0171674710cdbb32f10e990f
|
|
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
|
---
|
|
qmake/property.cpp | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/qmake/property.cpp b/qmake/property.cpp
|
|
index c1b7a9f..af2eacf 100644
|
|
--- a/qmake/property.cpp
|
|
+++ b/qmake/property.cpp
|
|
@@ -68,7 +68,7 @@ static const struct {
|
|
{ "QT_INSTALL_IMPORTS", QLibraryInfo::ImportsPath, false },
|
|
{ "QT_INSTALL_QML", QLibraryInfo::Qml2ImportsPath, false },
|
|
{ "QT_INSTALL_TRANSLATIONS", QLibraryInfo::TranslationsPath, false },
|
|
- { "QT_INSTALL_CONFIGURATION", QLibraryInfo::SettingsPath, false },
|
|
+ { "QT_INSTALL_SETTINGS", QLibraryInfo::SettingsPath, false },
|
|
{ "QT_INSTALL_EXAMPLES", QLibraryInfo::ExamplesPath, false },
|
|
{ "QT_INSTALL_DEMOS", QLibraryInfo::ExamplesPath, false }, // Just backwards compat
|
|
{ "QT_HOST_PREFIX", QLibraryInfo::HostPrefixPath, true },
|
|
--
|
|
1.8.2.1
|
|
|