Changeset 846 for trunk/src/corelib/codecs/codecs.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/codecs/codecs.pri (modified) (2 diffs)

trunk/src/corelib/codecs/codecs.pri

@@ -32 +32 @@
                 DEFINES += GNU_LIBICONV
                 !mac:LIBS_PRIVATE *= -liconv
-        } else {
+        } else:contains(QT_CONFIG,sun-libiconv) {
+                HEADERS += codecs/qiconvcodec_p.h
+                SOURCES += codecs/qiconvcodec.cpp
+                DEFINES += GNU_LIBICONV
+        } else:!symbian {
                 # no iconv, so we put all plugins in the library
                 HEADERS += \
@@ -53 +57 @@
         }
 }
+