summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Barron <jbarron@trolltech.com>2009-06-03 13:48:52 (GMT)
committerJason Barron <jbarron@trolltech.com>2009-06-03 13:54:43 (GMT)
commitc3cad947658ba2ea70e6b9335dd365192a6ed4c4 (patch)
treefba5bc0721bed81ea90ac85ff263c2acb335e794
parenta1983f1daf12b2d41082036b88d14236bf89d4d9 (diff)
downloadQt-c3cad947658ba2ea70e6b9335dd365192a6ed4c4.zip
Qt-c3cad947658ba2ea70e6b9335dd365192a6ed4c4.tar.gz
Qt-c3cad947658ba2ea70e6b9335dd365192a6ed4c4.tar.bz2
Make qmake compile from .pro on other platforms.
The qpopen.cpp file is a workaround for the fact that the Metrowerks compiler that we are (ab)using to build Windows binaries is lacking a popen() function in the standard library. So only enable the workaround on the platform that needs it.
-rw-r--r--qmake/qmake.pri7
1 files changed, 6 insertions, 1 deletions
diff --git a/qmake/qmake.pri b/qmake/qmake.pri
index b51db32..4e58732 100644
--- a/qmake/qmake.pri
+++ b/qmake/qmake.pri
@@ -9,7 +9,6 @@ DEFINES += QT_NO_TEXTCODEC QT_NO_LIBRARY QT_NO_STL QT_NO_COMPRESS QT_NO_UNICODET
SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \
generators/unix/unixmake2.cpp generators/unix/unixmake.cpp meta.cpp \
option.cpp generators/win32/winmakefile.cpp generators/win32/mingw_make.cpp \
- qpopen.cpp \
generators/makefiledeps.cpp generators/metamakefile.cpp generators/mac/pbuilder_pbx.cpp \
generators/xmloutput.cpp generators/win32/borland_bmake.cpp \
generators/win32/msvc_nmake.cpp generators/projectgenerator.cpp \
@@ -19,6 +18,12 @@ 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
+
+# MWC does not provide an implementation of popen() so fake it.
+win32-mwc {
+ SOURCES += qpopen.cpp \
+}
+
HEADERS += project.h property.h generators/makefile.h \
generators/unix/unixmake.h meta.h option.h cachekeys.h \