summaryrefslogtreecommitdiff
path: root/qmake
authormickeyl <mickeyl>2003-12-28 00:32:51 (UTC)
committer mickeyl <mickeyl>2003-12-28 00:32:51 (UTC)
commite889485e945d8fa9564566f286114be10d2a1ce5 (patch) (unidiff)
tree23eb3b07521f36d22b165793164c25f1d0acdaae /qmake
parent7812187f6732eef351e501d993aa664b7e351cbb (diff)
downloadopie-e889485e945d8fa9564566f286114be10d2a1ce5.zip
opie-e889485e945d8fa9564566f286114be10d2a1ce5.tar.gz
opie-e889485e945d8fa9564566f286114be10d2a1ce5.tar.bz2
fix qmake 1.05a to generate the PRO line in a Makefile
this feature seemed to have been removed in 1.05a - it was in 1.04a and is needed for opie-lupdate to work
Diffstat (limited to 'qmake') (more/less context) (ignore whitespace changes)
-rw-r--r--qmake/generators/unix/unixmake2.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 7fbb9f4..d8a4a0d 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -137,16 +137,17 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
137 t << "GZIP = " << var("QMAKE_GZIP") << endl; 137 t << "GZIP = " << var("QMAKE_GZIP") << endl;
138 t << "COPY = " << var("QMAKE_COPY") << endl; 138 t << "COPY = " << var("QMAKE_COPY") << endl;
139 t << "COPY_FILE= " << var("QMAKE_COPY_FILE") << endl; 139 t << "COPY_FILE= " << var("QMAKE_COPY_FILE") << endl;
140 t << "COPY_DIR = " << var("QMAKE_COPY_DIR") << endl; 140 t << "COPY_DIR = " << var("QMAKE_COPY_DIR") << endl;
141 t << "DEL_FILE = " << var("QMAKE_DEL_FILE") << endl; 141 t << "DEL_FILE = " << var("QMAKE_DEL_FILE") << endl;
142 t << "SYMLINK = " << var("QMAKE_SYMBOLIC_LINK") << endl; 142 t << "SYMLINK = " << var("QMAKE_SYMBOLIC_LINK") << endl;
143 t << "DEL_DIR = " << var("QMAKE_DEL_DIR") << endl; 143 t << "DEL_DIR = " << var("QMAKE_DEL_DIR") << endl;
144 t << "MOVE = " << var("QMAKE_MOVE") << endl; 144 t << "MOVE = " << var("QMAKE_MOVE") << endl;
145 t << "PRO = " << fileFixify(project->projectFile() )<< endl;
145 t << "CHK_DIR_EXISTS= " << var("QMAKE_CHK_DIR_EXISTS") << endl; 146 t << "CHK_DIR_EXISTS= " << var("QMAKE_CHK_DIR_EXISTS") << endl;
146 t << "MKDIR = " << var("QMAKE_MKDIR") << endl; 147 t << "MKDIR = " << var("QMAKE_MKDIR") << endl;
147 t << endl; 148 t << endl;
148 149
149 t << "####### Output directory" << endl << endl; 150 t << "####### Output directory" << endl << endl;
150 if (! project->variables()["OBJECTS_DIR"].isEmpty()) 151 if (! project->variables()["OBJECTS_DIR"].isEmpty())
151 t << "OBJECTS_DIR = " << var("OBJECTS_DIR") << endl; 152 t << "OBJECTS_DIR = " << var("OBJECTS_DIR") << endl;
152 else 153 else