summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorSami Lempinen <sami.lempinen@nokia.com>2011-10-14 06:18:15 (GMT)
committerSami Lempinen <sami.lempinen@nokia.com>2011-10-14 06:18:15 (GMT)
commit01057867c3e5e97fc8b58601e3cee6dfef0df205 (patch)
tree96125e444f32691c73bc87f0bc938993b7737899 /qmake
parent138b9d7349d5daa1808d8bd891c5ecf817f98c52 (diff)
parent77563a2e63562e4e010e53dd79a707d9d7ed3f3d (diff)
downloadQt-01057867c3e5e97fc8b58601e3cee6dfef0df205.zip
Qt-01057867c3e5e97fc8b58601e3cee6dfef0df205.tar.gz
Qt-01057867c3e5e97fc8b58601e3cee6dfef0df205.tar.bz2
Merge remote-tracking branch 'qt/4.8'
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/integrity/gbuild.cpp8
-rw-r--r--qmake/qmake.pri2
2 files changed, 3 insertions, 7 deletions
diff --git a/qmake/generators/integrity/gbuild.cpp b/qmake/generators/integrity/gbuild.cpp
index f273237..f9fdb38 100644
--- a/qmake/generators/integrity/gbuild.cpp
+++ b/qmake/generators/integrity/gbuild.cpp
@@ -392,19 +392,13 @@ QString GBuildMakefileGenerator::writeOne(QString filename, QString pathtoremove
s += "\n";
} else if (filename.endsWith(Option::cpp_ext.first())) {
QString tmpstr(filename.section("/", -1));
-// QString moctool(project->values("QMAKE_MOC").first());
QString filepath(pathtoremove);
if (!project->values("QT_SOURCE_TREE").isEmpty()) {
filepath.remove(project->values("QT_SOURCE_TREE").first());
filepath.remove(0, 1);
}
-// if (!project->values("QT_BUILD_TREE").isEmpty()) {
-// moctool.remove(project->values("QT_BUILD_TREE").first());
-// moctool.remove(0, 1);
-// }
s += "\n\t:preexecShellSafe='${QT_BUILD_DIR}/bin/moc ";
-// s += moctool;
-// s += " ";
+ s += "-nn ";
s += varGlue("DEFINES", "-D", " -D", " ");
s += varGlue("INCLUDEPATH", "-I", " -I", " ");
s += filepath;
diff --git a/qmake/qmake.pri b/qmake/qmake.pri
index 87735d6..c2fc1d5 100644
--- a/qmake/qmake.pri
+++ b/qmake/qmake.pri
@@ -20,6 +20,7 @@ SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \
generators/symbian/symmake_abld.cpp \
generators/symbian/symmake_sbsv2.cpp \
generators/symbian/initprojectdeploy_symbian.cpp \
+ generators/integrity/gbuild.cpp \
windows/registry.cpp \
symbian/epocroot.cpp
@@ -36,6 +37,7 @@ HEADERS += project.h property.h generators/makefile.h \
generators/symbian/symmake_abld.h \
generators/symbian/symmake_sbsv2.h \
generators/symbian/initprojectdeploy_symbian.h \
+ generators/integrity/gbuild.h \
windows/registry_p.h \
symbian/epocroot_p.h