Changeset 767 for branches/vendor/nokia/qt/current/qmake/Makefile.unix

Timestamp:

Aug 2, 2010, 5:05:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

vendor: Merged in qt-everywhere-opensource-src-4.6.3 from Nokia.

File:

• branches/vendor/nokia/qt/current/qmake/Makefile.unix (modified) (5 diffs)

branches/vendor/nokia/qt/current/qmake/Makefile.unix

@@ -11 +11 @@
      meta.o makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \
      borland_bmake.o msvc_dsp.o msvc_vcproj.o msvc_nmake.o msvc_objectmodel.o \
-     symmake.o initprojectdeploy_symbian.o symmake_abld.o symmake_sbsv2.o
+     symmake.o initprojectdeploy_symbian.o symmake_abld.o symmake_sbsv2.o \
+     registry.o \
+     epocroot.o
 
 #qt code
@@ -33 +35 @@
            generators/win32/msvc_objectmodel.cpp generators/win32/msvc_nmake.cpp generators/win32/borland_bmake.cpp \
            generators/symbian/symmake.cpp generators/symbian/initprojectdeploy_symbian.cpp \
+
+
            generators/symbian/symmake_abld.cpp generators/symbian/symmake_sbsv2.cpp \
            $(SOURCE_PATH)/src/corelib/codecs/qtextcodec.cpp $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp \
@@ -63 +67 @@
            -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
            -I$(BUILD_PATH)/src/corelib/global -I$(BUILD_PATH)/src/corelib/xml \
+
            -DQT_NO_PCRE \
            -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED \
@@ -282 +287 @@
         $(CXX) -c -o $@ $(CXXFLAGS) generators/symbian/initprojectdeploy_symbian.cpp
 
+
+
+
+
+
+
 projectgenerator.o: generators/projectgenerator.cpp
         $(CXX) -c -o $@ $(CXXFLAGS) generators/projectgenerator.cpp
@@ -290 +301 @@
 qxmlutils.o: $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp
         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp
+
 #default rules
 .cpp.o: