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 | |
| 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')
| -rw-r--r-- | qmake/Makefile.win32 | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 48d84b7..3cd180c 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -78,7 +78,6 @@ OBJS = project.obj main.obj makefile.obj unixmake.obj unixmake2.obj mingw borland_bmake.obj msvc_nmake.obj msvc_dsp.obj msvc_vcproj.obj \ msvc_objectmodel.obj symmake.obj initprojectdeploy_symbian.obj \ registry.obj \ - epocroot.obj \ symmake_abld.obj symmake_sbsv2.obj !IFDEF QMAKE_OPENSOURCE_EDITION @@ -203,7 +202,6 @@ clean:: -del symmake_sbsv2.obj -del initprojectdeploy_symbian.obj -del registry.obj - -del epocroot.obj -del pbuilder_pbx.obj -del qxmlstream.obj -del qxmlutils.obj @@ -406,9 +404,6 @@ initprojectdeploy_symbian.obj: $(SOURCE_PATH)/qmake/generators/symbian/initproje registry.obj: $(SOURCE_PATH)/tools/shared/windows/registry.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/windows/registry.cpp -epocroot.obj: $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp - md5.obj: $(SOURCE_PATH)\src\3rdparty\md5\md5.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\3rdparty\md5\md5.cpp |