diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-06-03 13:03:03 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-06-03 13:16:13 (GMT) |
| commit | c9c8742b20c025ad893bdde48cf382267e0b646e (patch) | |
| tree | b31419366517a8b97cd73c1bebc1740d889c04c0 /qmake | |
| parent | 91f5c7314afdfd43c867266fc1bc418e0f70bac7 (diff) | |
| download | Qt-c9c8742b20c025ad893bdde48cf382267e0b646e.zip Qt-c9c8742b20c025ad893bdde48cf382267e0b646e.tar.gz Qt-c9c8742b20c025ad893bdde48cf382267e0b646e.tar.bz2 | |
Allow qmake to compile using it's .pro file.
This fixes a problem where qmake would not compile when it was built
from it's .pro file because this method uses the pre-compiled header.
This header was causing a compile error in qlocale.cpp because
qtextstream.h was included and this includes qlocale.h. The problem in
qlocale.cpp was that it uses a define called QLOCALE_CPP to enable
extra functions in the class declaration, but the pre-compiled header
was preventing the qlocale.h from being re-processed and therefore the
function was never compiled in.
Reviewed-by: Marius Storm-Olsen
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/qmake_pch.h | 2 |
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> |