Differential D4593 Diff 11319 projectmanagers/qmake/qmakeutils.cpp

Changeset View

Standalone View

View Options

projectmanagers/qmake/qmakeutils.cpp

Show First 20 Lines • Show All 46 Lines • ▼ Show 20 Line(s)43 if (!buildDir.isValid()) {
47 } 47​ }
48 } 48​ }
49 49​
50 qCDebug(KDEV_QMAKE) << "Build directory for" << project->name() << "is" << buildDir; 50​ qCDebug(KDEV_QMAKE) << "Build directory for" << project->name() << "is" << buildDir;
51 51​
52 if (!QMakeConfig::isConfigured(project)) { 52​ if (!QMakeConfig::isConfigured(project)) {
53 return true; 53​ return true;
54 } 54​ }
55 const QString qmakeBinary = QMakeConfig::qmakeBinary(project); 55​ const QString qmakeExecutable = QMakeConfig::qmakeExecutable(project);
56 if (qmakeBinary.isEmpty()) { 56​ if (qmakeExecutable.isEmpty()) {
57 return true; 57​ return true;
58 } 58​ }
59 const QHash<QString, QString> vars = queryQMake(project); 59​ const QHash<QString, QString> vars = queryQMake(project);
60 if (vars.isEmpty()) { 60​ if (vars.isEmpty()) {
61 return true; 61​ return true;
62 } 62​ }
63 if (QMakeConfig::findBasicMkSpec(vars).isEmpty()) { 63​ if (QMakeConfig::findBasicMkSpec(vars).isEmpty()) {
64 return true; 64​ return true;
65 } 65​ }
66 66​
67 if (!QFile::exists(buildDir.toLocalFile())) { 67​ if (!QFile::exists(buildDir.toLocalFile())) {
68 qCDebug(KDEV_QMAKE) << "build dir" << buildDir << "configured, but does not exist yet"; 68​ qCDebug(KDEV_QMAKE) << "build dir" << buildDir << "configured, but does not exist yet";
69 return true; 69​ return true;
70 } 70​ }
71 71​
72 qCDebug(KDEV_QMAKE) << "No configure needed for project" << project->name(); 72​ qCDebug(KDEV_QMAKE) << "No configure needed for project" << project->name();
73 return false; 73​ return false;
74} 74​}
75 75​
76QHash<QString, QString> QMakeUtils::queryQMake(IProject* project) 76​QHash<QString, QString> QMakeUtils::queryQMake(IProject* project)
77{ 77​{
78 if (!project->path().toUrl().isLocalFile()) 78​ if (!project->path().toUrl().isLocalFile())
79 return QHash<QString, QString>(); 79​ return QHash<QString, QString>();
80 80​
81 return QMakeConfig::queryQMake(QMakeConfig::qmakeBinary(project)); 81​ return QMakeConfig::queryQMake(QMakeConfig::qmakeExecutable(project));
82} 82​}