Changeset 561 for trunk/src/phonon

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/phonon/phonon.pro (modified) (2 diffs)

trunk/src/phonon/phonon.pro

@@ -1 +1 @@
 TARGET = phonon
-include($$QT_SOURCE_TREE/src/qbase.pri)
+include(../qbase.pri)
 
 PHONON_MAJOR_VERSION = $${QT_MAJOR_VERSION}
@@ -114 +114 @@
 
 contains(QT_CONFIG, reduce_exports): CONFIG += hide_symbols
+
+symbian: {
+    # Phonon depends on numeric_limits. Enabling STL support in Qt
+    # would bring in link dependencies, and we don't need that for
+    # numeric_limits, hence we here merely ensure we bring in the necessary
+    # header.
+    INCLUDEPATH *= $$OS_LAYER_STDCPP_SYSTEMINCLUDE
+
+        # Without this setting, code using numeric_limits will fail
+        # for winscw, although armv5 works fine no matter what.
+    QMAKE_CXXFLAGS.CW *= $$STLLIB_USAGE_CW_FLAGS
+    
+    TARGET.UID3 = 0x2001E624
+}