summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-06-20 16:45:12 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-06-20 16:45:12 +0200
commit6213b8145772d3dc584907a544f6c46b8cef74e2 (patch)
tree4c1902793bb78511e63c09cbe92f9eda6b3d7237 /tools
parent75e9c7d6bc662e62e9ce8b641588183992c1e8bf (diff)
parent25739bebba0343a8b35775a073c49f0fba080762 (diff)
Merge remote-tracking branch 'origin/stable' into dev
Conflicts: src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp tools/configure/configureapp.cpp Change-Id: I3092bd3276af14304b7ab3ae1e1cc05d11cdede0
Diffstat (limited to 'tools')
-rw-r--r--tools/configure/configureapp.cpp26
-rw-r--r--tools/configure/configureapp.h1
2 files changed, 17 insertions, 10 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 5ed6b803c3..cd5ed4caea 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -151,18 +151,14 @@ Configure::Configure(int& argc, char** argv)
const QString installPath = buildPath;
#endif
if (sourceDir != buildDir) { //shadow builds!
- if (QStandardPaths::findExecutable(QStringLiteral("perl.exe")).isEmpty()) {
- cout << "Error: Creating a shadow build of Qt requires" << endl
- << "perl to be in the PATH environment";
- exit(0); // Exit cleanly for Ctrl+C
- }
-
QDir(buildPath).mkpath("bin");
buildDir.mkpath("mkspecs");
}
defaultBuildParts << QStringLiteral("libs") << QStringLiteral("tools") << QStringLiteral("examples");
+ allBuildParts = defaultBuildParts;
+ allBuildParts << QStringLiteral("tests");
dictionary[ "QT_SOURCE_TREE" ] = sourcePath;
dictionary[ "QT_BUILD_TREE" ] = buildPath;
dictionary[ "QT_INSTALL_PREFIX" ] = installPath;
@@ -993,12 +989,22 @@ void Configure::parseCmdLine()
++i;
if (i == argCount)
break;
- buildParts += configCmdLine.at(i);
+ QString part = configCmdLine.at(i);
+ if (!allBuildParts.contains(part)) {
+ cout << "Unknown part " << part << " passed to -make." << endl;
+ dictionary["DONE"] = "error";
+ }
+ buildParts += part;
} else if (configCmdLine.at(i) == "-nomake") {
++i;
if (i == argCount)
break;
- nobuildParts.append(configCmdLine.at(i));
+ QString part = configCmdLine.at(i);
+ if (!allBuildParts.contains(part)) {
+ cout << "Unknown part " << part << " passed to -nomake." << endl;
+ dictionary["DONE"] = "error";
+ }
+ nobuildParts += part;
}
else if (configCmdLine.at(i) == "-skip") {
@@ -1562,8 +1568,8 @@ void Configure::desc(const char *mark_option, const char *mark, const char *opti
void Configure::applySpecSpecifics()
{
if (dictionary.contains("XQMAKESPEC")) {
- //Disable building tools, docs and translations when cross compiling.
- nobuildParts << "docs" << "translations" << "tools";
+ //Disable building tools when cross compiling.
+ nobuildParts << "tools";
}
if (dictionary.value("XQMAKESPEC").startsWith("wince")) {
diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h
index 3014e409f9..8f95e1fb95 100644
--- a/tools/configure/configureapp.h
+++ b/tools/configure/configureapp.h
@@ -104,6 +104,7 @@ private:
// Our variable dictionaries
QMap<QString,QString> dictionary;
+ QStringList allBuildParts;
QStringList defaultBuildParts;
QStringList buildParts;
QStringList nobuildParts;