Changeset 846 for trunk/demos/spectrum/3rdparty/fftreal

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)
• demos/spectrum/3rdparty/fftreal/fftreal.pro (modified) (2 diffs)
• demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp (modified) (1 diff)
• demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h (modified) (1 diff)

trunk/demos/spectrum/3rdparty/fftreal/fftreal.pro

@@ +1 @@
+
+
+
+
 TEMPLATE = lib
 TARGET   = fftreal
@@ -30 +34 @@
 symbian {
     # Provide unique ID for the generated binary, required by Symbian OS
-    TARGET.UID3 = 0xA000E3FB
+    TARGET.UID3 = 0xA000E
     TARGET.CAPABILITY = UserEnvironment
+
+
+
+
 } else {
-    macx {
-        CONFIG += lib_bundle
-    } else {
-        DESTDIR = ../../bin
-    }
-} 
+    !symbian: DESTDIR = ../..$${spectrum_build_dir}
+}
 
 # Install

trunk/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp

@@ -1 +1 @@
 /***************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation ([email protected])
 **

trunk/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h

@@ -1 +1 @@
 /***************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation ([email protected])
 **