summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-02-11 10:42:03 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-11 13:30:31 +0100
commit7a7d82ffd9fac842fb573aad4fe28e27bc879f91 (patch)
tree4ed203367b9e2e4e4a49421f4241a7305ccf3e0a /qmake
parent8b7a9b4898c85e81d87cf642ec59ce85e917ee35 (diff)
Implement QMAKE_SUBSTITUTES.config = verbatim.
Change-Id: Ie0b333fa7fae2283e99e42f9cd7bab4e84991f40 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/makefile.cpp110
1 files changed, 61 insertions, 49 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index b595486821..dd098596e9 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -498,62 +498,74 @@ MakefileGenerator::init()
}
outn = fileFixify(inn.left(inn.length()-3), qmake_getpwd(), Option::output_dir);
}
+
+ QString confign = subs.at(i) + ".config";
+ bool verbatim = false;
+ if (v.contains(confign))
+ verbatim = v[confign].contains(QLatin1String("verbatim"));
+
QFile in(inn);
- if(in.open(QFile::ReadOnly)) {
- QString contents;
- QStack<int> state;
- enum { IN_CONDITION, MET_CONDITION, PENDING_CONDITION };
- for(int count = 1; !in.atEnd(); ++count) {
- QString line = QString::fromUtf8(in.readLine());
- if(line.startsWith("!!IF ")) {
- if(state.isEmpty() || state.top() == IN_CONDITION) {
- QString test = line.mid(5, line.length()-(5+1));
- if(project->test(test))
- state.push(IN_CONDITION);
- else
- state.push(PENDING_CONDITION);
- } else {
- state.push(MET_CONDITION);
- }
- } else if(line.startsWith("!!ELIF ")) {
- if(state.isEmpty()) {
- warn_msg(WarnLogic, "(%s:%d): Unexpected else condition",
- in.fileName().toLatin1().constData(), count);
- } else if(state.top() == PENDING_CONDITION) {
- QString test = line.mid(7, line.length()-(7+1));
- if(project->test(test)) {
+ if (in.open(QFile::ReadOnly)) {
+ QByteArray contentBytes;
+ if (verbatim) {
+ contentBytes = in.readAll();
+ } else {
+ QString contents;
+ QStack<int> state;
+ enum { IN_CONDITION, MET_CONDITION, PENDING_CONDITION };
+ for (int count = 1; !in.atEnd(); ++count) {
+ QString line = QString::fromUtf8(in.readLine());
+ if (line.startsWith("!!IF ")) {
+ if (state.isEmpty() || state.top() == IN_CONDITION) {
+ QString test = line.mid(5, line.length()-(5+1));
+ if (project->test(test))
+ state.push(IN_CONDITION);
+ else
+ state.push(PENDING_CONDITION);
+ } else {
+ state.push(MET_CONDITION);
+ }
+ } else if (line.startsWith("!!ELIF ")) {
+ if (state.isEmpty()) {
+ warn_msg(WarnLogic, "(%s:%d): Unexpected else condition",
+ in.fileName().toLatin1().constData(), count);
+ } else if (state.top() == PENDING_CONDITION) {
+ QString test = line.mid(7, line.length()-(7+1));
+ if (project->test(test)) {
+ state.pop();
+ state.push(IN_CONDITION);
+ }
+ } else if (state.top() == IN_CONDITION) {
+ state.pop();
+ state.push(MET_CONDITION);
+ }
+ } else if (line.startsWith("!!ELSE")) {
+ if (state.isEmpty()) {
+ warn_msg(WarnLogic, "(%s:%d): Unexpected else condition",
+ in.fileName().toLatin1().constData(), count);
+ } else if (state.top() == PENDING_CONDITION) {
state.pop();
state.push(IN_CONDITION);
+ } else if (state.top() == IN_CONDITION) {
+ state.pop();
+ state.push(MET_CONDITION);
}
- } else if(state.top() == IN_CONDITION) {
- state.pop();
- state.push(MET_CONDITION);
- }
- } else if(line.startsWith("!!ELSE")) {
- if(state.isEmpty()) {
- warn_msg(WarnLogic, "(%s:%d): Unexpected else condition",
- in.fileName().toLatin1().constData(), count);
- } else if(state.top() == PENDING_CONDITION) {
- state.pop();
- state.push(IN_CONDITION);
- } else if(state.top() == IN_CONDITION) {
- state.pop();
- state.push(MET_CONDITION);
+ } else if (line.startsWith("!!ENDIF")) {
+ if (state.isEmpty())
+ warn_msg(WarnLogic, "(%s:%d): Unexpected endif",
+ in.fileName().toLatin1().constData(), count);
+ else
+ state.pop();
+ } else if (state.isEmpty() || state.top() == IN_CONDITION) {
+ contents += project->expand(line, in.fileName(), count);
}
- } else if(line.startsWith("!!ENDIF")) {
- if(state.isEmpty())
- warn_msg(WarnLogic, "(%s:%d): Unexpected endif",
- in.fileName().toLatin1().constData(), count);
- else
- state.pop();
- } else if(state.isEmpty() || state.top() == IN_CONDITION) {
- contents += project->expand(line, in.fileName(), count);
}
+ contentBytes = contents.toUtf8();
}
QFile out(outn);
- if(out.exists() && out.open(QFile::ReadOnly)) {
- QString old = QString::fromUtf8(out.readAll());
- if(contents == old) {
+ if (out.exists() && out.open(QFile::ReadOnly)) {
+ QByteArray old = out.readAll();
+ if (contentBytes == old) {
v["QMAKE_INTERNAL_INCLUDED_FILES"].append(in.fileName());
continue;
}
@@ -567,7 +579,7 @@ MakefileGenerator::init()
mkdir(QFileInfo(out).absolutePath());
if(out.open(QFile::WriteOnly)) {
v["QMAKE_INTERNAL_INCLUDED_FILES"].append(in.fileName());
- out.write(contents.toUtf8());
+ out.write(contentBytes);
} else {
warn_msg(WarnLogic, "Cannot open substitute for output '%s'",
out.fileName().toLatin1().constData());