Differential D4593 Diff 11319 projectmanagers/qmake/qmakeprojectfile.cpp

Changeset View

Standalone View

View Options

projectmanagers/qmake/qmakeprojectfile.cpp

Show First 20 Lines • Show All 98 Lines • ▼ Show 20 Line(s)72{
99 m_variableValues["_PRO_FILE_"] = QStringList() << proFile(); 99​ m_variableValues["_PRO_FILE_"] = QStringList() << proFile();
100 m_variableValues["_PRO_FILE_PWD_"] = QStringList() << proFilePwd(); 100​ m_variableValues["_PRO_FILE_PWD_"] = QStringList() << proFilePwd();
101 m_variableValues["OUT_PWD"] = QStringList() << outPwd(); 101​ m_variableValues["OUT_PWD"] = QStringList() << outPwd();
102 102​
103 const QString qtInstallHeaders = QStringLiteral("QT_INSTALL_HEADERS"); 103​ const QString qtInstallHeaders = QStringLiteral("QT_INSTALL_HEADERS");
104 const QString qtVersion = QStringLiteral("QT_VERSION"); 104​ const QString qtVersion = QStringLiteral("QT_VERSION");
105 const QString qtInstallLibs = QStringLiteral("QT_INSTALL_LIBS"); 105​ const QString qtInstallLibs = QStringLiteral("QT_INSTALL_LIBS");
106 106​
107 const QString binary = QMakeConfig::qmakeBinary(project()); 107​ const QString executable = QMakeConfig::qmakeExecutable(project());
108 if (!m_qmakeQueryCache.contains(binary)) { 108​ if (!m_qmakeQueryCache.contains(executable)) {
109 const auto queryResult = QMakeConfig::queryQMake(binary, {qtInstallHeaders, qtVersion, qtInstallLibs}); 109​ const auto queryResult = QMakeConfig::queryQMake(executable, {qtInstallHeaders, qtVersion, qtInstallLibs});
110 if (queryResult.isEmpty()) { 110​ if (queryResult.isEmpty()) {
111 qCWarning(KDEV_QMAKE) << "Failed to query qmake - bad qmake binary configured?" << binary; 111​ qCWarning(KDEV_QMAKE) << "Failed to query qmake - bad qmake executable configured?" << executable;
112 } 112​ }
113 m_qmakeQueryCache[binary] = queryResult; 113​ m_qmakeQueryCache[executable] = queryResult;
114 } 114​ }
115 115​
116 const auto cachedQueryResult = m_qmakeQueryCache.value(binary); 116​ const auto cachedQueryResult = m_qmakeQueryCache.value(executable);
117 m_qtIncludeDir = cachedQueryResult.value(qtInstallHeaders); 117​ m_qtIncludeDir = cachedQueryResult.value(qtInstallHeaders);
118 m_qtVersion = cachedQueryResult.value(qtVersion); 118​ m_qtVersion = cachedQueryResult.value(qtVersion);
119 m_qtLibDir = cachedQueryResult.value(qtInstallLibs); 119​ m_qtLibDir = cachedQueryResult.value(qtInstallLibs);
120 120​
121 return QMakeFile::read(); 121​ return QMakeFile::read();
122} 122​}
123 123​
124QStringList QMakeProjectFile::subProjects() const 124​QStringList QMakeProjectFile::subProjects() const
▲ Show 20 Lines • Show All 304 Lines • Show Last 20 Lines