Fix at lot of QT_NO_ define guards for very tiny Qt builds.

Change-Id: If33639be245a1ad3782e1fde279371f330a988be
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

17 files changed, 96 insertions, 0 deletions

diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h
index 316e718..376d952 100644
--- a/src/corelib/global/qfeatures.h
+++ b/src/corelib/global/qfeatures.h
@@ -713,6 +713,11 @@
 #define QT_NO_PROXYMODEL
 #endif
 
+// QIdentityProxyModel
+#if !defined(QT_NO_IDENTITYPROXYMODEL) && defined(QT_NO_PROXYMODEL)
+#  define QT_NO_IDENTITYPROXYMODEL
+#endif
+
 // QStandardItemModel
 #if !defined(QT_NO_STANDARDITEMMODEL) && (defined(QT_NO_ITEMVIEWS))
 #define QT_NO_STANDARDITEMMODEL
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 8be70ab..2001362 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -338,12 +338,14 @@ public:
   Create an instance of Trolltech.conf. This ensures that the settings will not
   be thrown out of QSetting's cache for unused settings.
   */
+#ifndef QT_NO_SETTINGS
 Q_GLOBAL_STATIC_WITH_ARGS(QSettings, staticTrolltechConf, (QSettings::UserScope, QLatin1String("Trolltech")))
 
 QSettings *QCoreApplicationPrivate::trolltechConf()
 {
     return staticTrolltechConf();
 }
+#endif
 
 Q_CORE_EXPORT uint qGlobalPostedEventsCount()
 {
diff --git a/src/corelib/kernel/qcoreapplication_p.h b/src/corelib/kernel/qcoreapplication_p.h
index 82b9fba..d370356 100644
--- a/src/corelib/kernel/qcoreapplication_p.h
+++ b/src/corelib/kernel/qcoreapplication_p.h
@@ -148,7 +148,9 @@ public:
 #if defined(QT3_SUPPORT)
     static bool useQt3Support;
 #endif
+#ifndef QT_NO_SETTINGS
     static QSettings *trolltechConf();
+#endif
 };
 
 QT_END_NAMESPACE
diff --git a/src/corelib/tools/qlocale_icu.cpp b/src/corelib/tools/qlocale_icu.cpp
index 3a8b8cf..e8ef7b2 100644
--- a/src/corelib/tools/qlocale_icu.cpp
+++ b/src/corelib/tools/qlocale_icu.cpp
@@ -78,6 +78,10 @@ bool qt_initIcu(const QString &localeString)
     if (status == ErrorLoading)
         return false;
 
+#ifdef QT_NO_LIBRARY
+    status = ErrorLoading;
+    return false;
+#else
     if (status == NotLoaded) {
 
         // resolve libicui18n
@@ -139,6 +143,7 @@ bool qt_initIcu(const QString &localeString)
         // success :)
         status = Loaded;
     }
+#endif // QT_NO_LIBRARY
 
     if (icuCollator) {
         ptr_ucol_close(icuCollator);
diff --git a/src/dbus/qdbusunixfiledescriptor.cpp b/src/dbus/qdbusunixfiledescriptor.cpp
index 3d6d601..72455ab 100644
--- a/src/dbus/qdbusunixfiledescriptor.cpp
+++ b/src/dbus/qdbusunixfiledescriptor.cpp
@@ -47,6 +47,8 @@
 # include <private/qcore_unix_p.h>
 #endif
 
+#ifndef QT_NO_DBUS
+
 QT_BEGIN_NAMESPACE
 
 /*!
@@ -324,3 +326,5 @@ QDBusUnixFileDescriptorPrivate::~QDBusUnixFileDescriptorPrivate()
 #endif
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_DBUS
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
index a015880..83484e3 100644
--- a/src/network/ssl/qsslcertificate.cpp
+++ b/src/network/ssl/qsslcertificate.cpp
@@ -107,6 +107,10 @@
     \value StateOrProvinceName "ST" The state or province.
 */
 
+#include <QtCore/qglobal.h>
+
+#ifndef QT_NO_OPENSSL
+
 #include "qsslsocket_openssl_symbols_p.h"
 #include "qsslcertificate.h"
 #include "qsslcertificate_p.h"
@@ -883,3 +887,5 @@ QDebug operator<<(QDebug debug, QSslCertificate::SubjectInfo info)
 #endif
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_OPENSSL
diff --git a/src/network/ssl/qsslcipher.cpp b/src/network/ssl/qsslcipher.cpp
index f7150c9..bf08dca 100644
--- a/src/network/ssl/qsslcipher.cpp
+++ b/src/network/ssl/qsslcipher.cpp
@@ -58,6 +58,10 @@
     \sa QSslSocket, QSslKey
 */
 
+#include <QtCore/qglobal.h>
+
+#ifndef QT_NO_OPENSSL
+
 #include "qsslcipher.h"
 #include "qsslcipher_p.h"
 #include "qsslsocket.h"
@@ -236,3 +240,5 @@ QDebug operator<<(QDebug debug, const QSslCipher &cipher)
 #endif
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_OPENSSL
diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp
index f37223a..5f522d1 100644
--- a/src/network/ssl/qsslconfiguration.cpp
+++ b/src/network/ssl/qsslconfiguration.cpp
@@ -39,6 +39,10 @@
 **
 ****************************************************************************/
 
+#include <QtCore/qglobal.h>
+
+#ifndef QT_NO_OPENSSL
+
 #include "qsslconfiguration.h"
 #include "qsslconfiguration_p.h"
 #include "qsslsocket.h"
@@ -572,3 +576,5 @@ void QSslConfiguration::setDefaultConfiguration(const QSslConfiguration &configu
 }
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_OPENSSL
diff --git a/src/network/ssl/qsslerror.cpp b/src/network/ssl/qsslerror.cpp
index 8f8506a..b709aaa 100644
--- a/src/network/ssl/qsslerror.cpp
+++ b/src/network/ssl/qsslerror.cpp
@@ -91,6 +91,10 @@
     \sa QSslError::errorString()
 */
 
+#include <QtCore/qglobal.h>
+
+#ifndef QT_NO_OPENSSL
+
 #include "qsslerror.h"
 #include "qsslsocket.h"
 #ifndef QT_NO_DEBUG_STREAM
@@ -319,3 +323,5 @@ QDebug operator<<(QDebug debug, const QSslError::SslError &error)
 #endif
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_OPENSSL
diff --git a/src/network/ssl/qsslkey.cpp b/src/network/ssl/qsslkey.cpp
index 7e4c373..3f41406 100644
--- a/src/network/ssl/qsslkey.cpp
+++ b/src/network/ssl/qsslkey.cpp
@@ -55,6 +55,10 @@
     \sa QSslSocket, QSslCertificate, QSslCipher
 */
 
+#include <QtCore/qglobal.h>
+
+#ifndef QT_NO_OPENSSL
+
 #include "qsslsocket_openssl_symbols_p.h"
 #include "qsslkey.h"
 #include "qsslkey_p.h"
@@ -458,3 +462,5 @@ QDebug operator<<(QDebug debug, const QSslKey &key)
 #endif
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_OPENSSL
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index cc956b6..2dd35aa 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -298,6 +298,10 @@
     \sa peerVerifyError()
 */
 
+#include <QtCore/qglobal.h>
+
+#ifndef QT_NO_OPENSSL
+
 #include "qsslcipher.h"
 #include "qsslsocket.h"
 #include "qsslsocket_openssl_p.h"
@@ -2334,3 +2338,5 @@ QT_END_NAMESPACE
 // For private slots
 #define d d_ptr
 #include "moc_qsslsocket.cpp"
+
+#endif // QT_NO_OPENSSL
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
index 367d07e..0ea174e 100644
--- a/src/network/ssl/qsslsocket_openssl.cpp
+++ b/src/network/ssl/qsslsocket_openssl.cpp
@@ -42,6 +42,10 @@
 //#define QSSLSOCKET_DEBUG
 //#define QT_DECRYPT_SSL_TRAFFIC
 
+#include <QtCore/qglobal.h>
+
+#ifndef QT_NO_OPENSSL
+
 #include "qsslsocket_openssl_p.h"
 #include "qsslsocket_openssl_symbols_p.h"
 #include "qsslsocket.h"
@@ -1546,3 +1550,5 @@ bool QSslSocketBackendPrivate::isMatchingHostname(const QString &cn, const QStri
 }
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_OPENSSL
diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp
index 96054b2..e902dce 100644
--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -40,6 +40,10 @@
 ****************************************************************************/
 
 
+#include <QtCore/qglobal.h>
+
+#ifndef QT_NO_OPENSSL
+
 #include "qsslsocket_openssl_symbols_p.h"
 
 #ifdef Q_OS_WIN
@@ -984,3 +988,5 @@ QDateTime q_getTimeFromASN1(const ASN1_TIME *aTime)
 }
 
 QT_END_NAMESPACE
+
+#endif QT_NO_OPENSSL
diff --git a/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp b/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp
index 32b57ba..adf8d82 100644
--- a/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp
+++ b/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp
@@ -324,6 +324,7 @@ bool AccelTreeResourceLoader::retrieveUnparsedText(const QUrl &uri,
     if(!reply)
         return false;
 
+#ifndef QT_NO_TEXTCODEC
     const QTextCodec * codec;
     if(encoding.isEmpty())
     {
@@ -367,6 +368,10 @@ bool AccelTreeResourceLoader::retrieveUnparsedText(const QUrl &uri,
             return false;
     }
 
+#else
+    const QString result = QString::fromUtf8(reply->readAll());
+#endif // QT_NO_TEXTCODEC
+
     const int len = result.length();
     /* This code is a candidate for threading. Divide and conqueror. */
     for(int i = 0; i < len; ++i)
diff --git a/src/xmlpatterns/api/qxmlserializer.cpp b/src/xmlpatterns/api/qxmlserializer.cpp
index 0ad097a..7c90b50 100644
--- a/src/xmlpatterns/api/qxmlserializer.cpp
+++ b/src/xmlpatterns/api/qxmlserializer.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+#include <QtCore/qglobal.h>
+
 #include "qdynamiccontext_p.h"
 #include "qpatternistlocale_p.h"
 #include "qitem_p.h"
@@ -56,7 +58,9 @@ QXmlSerializerPrivate::QXmlSerializerPrivate(const QXmlQuery &query,
       state(QXmlSerializer::BeforeDocumentElement),
       np(query.namePool().d),
       device(outputDevice),
+#ifndef QT_NO_TEXTCODEC
       codec(QTextCodec::codecForMib(106)), /* UTF-8 */
+#endif
       query(query)
 {
     hasClosedElement.reserve(EstimatedTreeDepth);
@@ -86,8 +90,10 @@ QXmlSerializerPrivate::QXmlSerializerPrivate(const QXmlQuery &query,
 
     namespaces.push(defNss);
 
+#ifndef QT_NO_TEXTCODEC
     /* If we don't set this flag, QTextCodec will generate a BOM. */
     converterState.flags = QTextCodec::IgnoreHeader;
+#endif
 }
 
 /*!
@@ -264,7 +270,11 @@ void QXmlSerializer::writeEscapedAttribute(const QString &toEscape)
 void QXmlSerializer::write(const QString &content)
 {
     Q_D(QXmlSerializer);
+#ifndef QT_NO_TEXTCODEC
     d->device->write(d->codec->fromUnicode(content.constData(), content.length(), &d->converterState));
+#else
+    d->device->write(content.toUtf8());
+#endif
 }
 
 /*!
@@ -280,9 +290,13 @@ void QXmlSerializer::write(const QXmlName &name)
         QByteArray &mutableCell = d->nameCache[name.code()];
 
         const QString content(d->np->toLexical(name));
+#ifndef QT_NO_TEXTCODEC
         mutableCell = d->codec->fromUnicode(content.constData(),
                                             content.length(),
                                             &d->converterState);
+#else
+        mutableCell = content.toUtf8();
+#endif
         d->device->write(mutableCell);
     }
     else
@@ -306,7 +320,9 @@ void QXmlSerializer::startElement(const QXmlName &name)
     Q_D(QXmlSerializer);
     Q_ASSERT(d->device);
     Q_ASSERT(d->device->isWritable());
+#ifndef QT_NO_TEXTCODEC
     Q_ASSERT(d->codec);
+#endif
     Q_ASSERT(!name.isNull());
 
     d->namespaces.push(QVector<QXmlName>());
@@ -605,6 +621,9 @@ QIODevice *QXmlSerializer::outputDevice() const
     return d->device;
 }
 
+
+#ifndef QT_NO_TEXTCODEC
+
 /*!
   Sets the codec the serializer will use for encoding its XML output.
   The output codec is set to \a outputCodec. By default, the output
@@ -632,6 +651,8 @@ const QTextCodec *QXmlSerializer::codec() const
     return d->codec;
 }
 
+#endif // QT_NO_TEXTCODEC
+
 /*!
  \reimp
  */
diff --git a/src/xmlpatterns/api/qxmlserializer.h b/src/xmlpatterns/api/qxmlserializer.h
index 80b9a2d..fbc3afe 100644
--- a/src/xmlpatterns/api/qxmlserializer.h
+++ b/src/xmlpatterns/api/qxmlserializer.h
@@ -85,8 +85,10 @@ public:
 
     QIODevice *outputDevice() const;
 
+#ifndef QT_NO_TEXTCODEC
     void setCodec(const QTextCodec *codec);
     const QTextCodec *codec() const;
+#endif
 
     /* The members below are internal, not part of the public API, and
      * unsupported. Using them leads to undefined behavior. */
diff --git a/src/xmlpatterns/api/qxmlserializer_p.h b/src/xmlpatterns/api/qxmlserializer_p.h
index e3db705..51923c8 100644
--- a/src/xmlpatterns/api/qxmlserializer_p.h
+++ b/src/xmlpatterns/api/qxmlserializer_p.h
@@ -87,8 +87,10 @@ public:
     QStack<QVector<QXmlName> >          namespaces;
 
     QIODevice *                         device;
+#ifndef QT_NO_TEXTCODEC
     const QTextCodec *                  codec;
     QTextCodec::ConverterState          converterState;
+#endif
     /**
      * Name cache. Since encoding QStrings are rather expensive
      * operations to do, and we on top of that would have to do