diff options
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/Makefile.unix | 2 | ||||
| -rw-r--r-- | qmake/Makefile.win32-g++ | 2 | ||||
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 1199d0a1c..c6a3906da 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -35,7 +35,7 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp qtmd5.cpp generators/makef CXXFLAGS= @QMAKE_CXXFLAGS@ \ -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \ -I@BUILD_PATH@/include/qmake -I@BUILD_PATH@/include -I@SOURCE_PATH@/include \ - -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \ + -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DTQT_NO_STL \ -DQT_NO_COMPRESS -I@QMAKESPEC@ -DHAVE_QCONFIG_CPP LFLAGS=@QMAKE_LFLAGS@ diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++ index b1598dfd9..564bfa2be 100644 --- a/qmake/Makefile.win32-g++ +++ b/qmake/Makefile.win32-g++ @@ -5,7 +5,7 @@ CXX = g++ CFLAGS = -c -o$@ -O \ -I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac -I..\include -I..\src\tools \ -I..\mkspecs\win32-g++ \ - -DUNICODE -DQT_NO_TEXTCODEC -DQT_LITE_COMPONENT -DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS + -DUNICODE -DQT_NO_TEXTCODEC -DQT_LITE_COMPONENT -DQT_NODLL -DTQT_NO_STL -DQT_NO_COMPRESS CXXFLAGS = $(CFLAGS) LFLAGS = LIBS = -lole32 -luuid diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 48e6ef545..789176b9c 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -922,7 +922,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t) << outdir << "allmoc.cpp: " << precomph << " " << varList("HEADERS_ORIG") << "\n\t" << "echo '#include \"" << precomph << "\"' >" << outdir << "allmoc.cpp" << "\n\t" - << "$(CXX) -E -DQT_MOC_CPP -DQT_NO_STL $(CXXFLAGS) $(INCPATH) >" << outdir << "allmoc.h " + << "$(CXX) -E -DQT_MOC_CPP -DTQT_NO_STL $(CXXFLAGS) $(INCPATH) >" << outdir << "allmoc.h " << outdir << "allmoc.cpp" << "\n\t" << "$(MOC) -o " << outdir << "allmoc.cpp " << outdir << "allmoc.h" << "\n\t" << "perl -pi -e 's{#include \"allmoc.h\"}{#define QT_H_CPP\\n#include \"" |