Changeset 846 for trunk/src/corelib/arch/symbian/arch.pri

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

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

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/arch/symbian/arch.pri (modified) (1 diff)

trunk/src/corelib/arch/symbian/arch.pri

@@ -3 +3 @@
 #
 SOURCES +=  $$QT_ARCH_CPP/qatomic_symbian.cpp \
-            $$QT_ARCH_CPP/../armv6/qatomic_generic_armv6.cpp
+            $$QT_ARCH_CPP/../armv6/qatomic_generic_armv6.cpp \
+            $$QT_ARCH_CPP/heap_hybrid.cpp \
+            $$QT_ARCH_CPP/debugfunction.cpp \
+            $$QT_ARCH_CPP/qt_heapsetup_symbian.cpp
+
+HEADERS +=  $$QT_ARCH_CPP/dla_p.h \
+            $$QT_ARCH_CPP/heap_hybrid_p.h \
+            $$QT_ARCH_CPP/common_p.h \
+            $$QT_ARCH_CPP/page_alloc_p.h \
+            $$QT_ARCH_CPP/slab_p.h \
+            $$QT_ARCH_CPP/qt_hybridHeap_symbian_p.h
+
+exists($${EPOCROOT}epoc32/include/platform/u32std.h):DEFINES += QT_SYMBIAN_HAVE_U32STD_H
+exists($${EPOCROOT}epoc32/include/platform/e32btrace.h):DEFINES += QT_SYMBIAN_HAVE_E32BTRACE_H