diff options
| author | axis <qt-info@nokia.com> | 2010-02-19 08:50:34 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-19 08:50:34 (GMT) |
| commit | 603dc7d659084c5d092de79fec08a0baca8eaa59 (patch) | |
| tree | 383eb16d49c8b59b9bab920932b906eb1f0d192e /qmake/Makefile.win32-g++ | |
| parent | ed604d1a6420c1e6598b7d509dd108aa20db4509 (diff) | |
| download | Qt-603dc7d659084c5d092de79fec08a0baca8eaa59.zip Qt-603dc7d659084c5d092de79fec08a0baca8eaa59.tar.gz Qt-603dc7d659084c5d092de79fec08a0baca8eaa59.tar.bz2 | |
Revert "Factored epocRoot implementation out of qmake"
This reverts commit 13cb80be958c40077245cbc4b36448a661e30c64.
It breaks non-Symbian platforms.
Diffstat (limited to 'qmake/Makefile.win32-g++')
| -rw-r--r-- | qmake/Makefile.win32-g++ | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++ index 169de3c..ebc7fe2 100644 --- a/qmake/Makefile.win32-g++ +++ b/qmake/Makefile.win32-g++ @@ -40,7 +40,6 @@ OBJS = project.o main.o makefile.o unixmake.o unixmake2.o mingw_make.o \ borland_bmake.o msvc_nmake.o msvc_dsp.o msvc_vcproj.o \ msvc_objectmodel.o symmake.o initprojectdeploy_symbian.o \ registry.o \ - epocroot.o \ symmake_abld.o symmake_sbsv2.o ifdef QMAKE_OPENSOURCE_EDITION @@ -284,9 +283,6 @@ initprojectdeploy_symbian.o: $(SOURCE_PATH)/qmake/generators/symbian/initproject registry.o: $(SOURCE_PATH)/tools/shared/windows/registry.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/windows/registry.cpp -epocroot.o: $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp - project.o: $(SOURCE_PATH)/qmake/project.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h $(CXX) $(CXXFLAGS) project.cpp |