Changeset 769 for trunk/qmake/Makefile.os2-g++

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• qmake/Makefile.os2-g++ (modified) (3 diffs)

trunk/qmake/Makefile.os2-g++

@@ -22 +22 @@
                 -I$(BUILD_PATH)/src/corelib/xml \
                 -I$(SOURCE_PATH)/mkspecs/os2-g++ \
+                -I$(SOURCE_PATH)/tools/shared \
                 -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NO_PCRE \
             -DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DHAVE_QCONFIG_CPP \
@@ -116 +117 @@
                 $(SOURCE_PATH)/src/corelib/io/qfsfileengine_os2.cpp \
                 $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator_os2.cpp \
-                $(SOURCE_PATH)/src/corelib/io/qsettings_os2.cpp
+                $(SOURCE_PATH)/src/corelib/io/qsettings_os2.cpp \
+        $(SOURCE_PATH)/tools/shared/windows/registry.cpp \
+        $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp
 
 define SRC_TO_OBJ
@@ -161 +164 @@
 
 $(foreach src,$(SOURCES),$(eval $(call SRC_TO_OBJ_RULE,$(src))))
+