summaryrefslogtreecommitdiffstats
path: root/qmake/Makefile.win32-g++
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-02-21 18:13:03 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-02-21 18:13:03 (GMT)
commitf05e08c1effde6641d9ac23df2a7d9219afdad96 (patch)
tree585a574e588f585eefb17ec54c27cad0ca027dbd /qmake/Makefile.win32-g++
parent9221250e01c78e77ce92d69e012053c46c2e3679 (diff)
downloadQt-f05e08c1effde6641d9ac23df2a7d9219afdad96.zip
Qt-f05e08c1effde6641d9ac23df2a7d9219afdad96.tar.gz
Qt-f05e08c1effde6641d9ac23df2a7d9219afdad96.tar.bz2
Revert "Factored epocRoot implementation out of qmake"
This reverts commit 13cb80be958c40077245cbc4b36448a661e30c64. Conflicts: qmake/Makefile.unix qmake/generators/symbian/symmake.cpp
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 d4d6e0e..0b47905 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_vcproj.o \
msvc_objectmodel.o symmake.o initprojectdeploy_symbian.o \
registry.o \
- epocroot.o \
symmake_abld.o symmake_sbsv2.o
ifdef QMAKE_OPENSOURCE_EDITION
@@ -281,9 +280,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