summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-06-04 17:24:49 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-06-04 17:24:49 (GMT)
commit5c17f3abe1c43539db613da78414bc0b27928814 (patch)
treeaeda95c710a5dd597d4e45a94f57729f0dc1a6dc /qmake
parentb70c535fb096652def0c4f6df6f9cd2827fa9c97 (diff)
parent398c022e8adefc6e71a6048da40c19f6169be831 (diff)
downloadQt-5c17f3abe1c43539db613da78414bc0b27928814.zip
Qt-5c17f3abe1c43539db613da78414bc0b27928814.tar.gz
Qt-5c17f3abe1c43539db613da78414bc0b27928814.tar.bz2
Merge commit 'origin/4.5'
Diffstat (limited to 'qmake')
-rw-r--r--qmake/qmake_pch.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/qmake_pch.h b/qmake/qmake_pch.h
index 1fec856..676c806 100644
--- a/qmake/qmake_pch.h
+++ b/qmake/qmake_pch.h
@@ -53,7 +53,7 @@
//#include "meta.h"
#include <qfile.h>
//#include "winmakefile.h"
-#include <qtextstream.h>
+//#include <qtextstream.h>
//#include "project.h"
#include <qstring.h>
#include <qstringlist.h>