diff options
| author | Alessandro Portale <aportale@trolltech.com> | 2009-06-03 15:17:31 (GMT) |
|---|---|---|
| committer | Alessandro Portale <aportale@trolltech.com> | 2009-06-03 15:17:31 (GMT) |
| commit | eb3d7fedfe3cb6a079be1d771252980adfeb13e4 (patch) | |
| tree | 83f17dd32495af0c6cef8db979e8027e6dc207aa | |
| parent | c1af1b23442f6d879d3f7eb8c193935f9887244a (diff) | |
| parent | c3cad947658ba2ea70e6b9335dd365192a6ed4c4 (diff) | |
| download | Qt-eb3d7fedfe3cb6a079be1d771252980adfeb13e4.zip Qt-eb3d7fedfe3cb6a079be1d771252980adfeb13e4.tar.gz Qt-eb3d7fedfe3cb6a079be1d771252980adfeb13e4.tar.bz2 | |
Merge commit 'origin/master' into softkeys
| -rw-r--r-- | qmake/qmake.pri | 7 |
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 \ |