summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorTasuku Suzuki <tasuku.suzuki@nokia.com>2011-03-21 14:13:16 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-03-21 14:13:16 (GMT)
commit84a342eea111f0a1da8fd0c417362aae2b851e56 (patch)
tree9ca77440d6503412408b5111d293dea088b8ffda /src/corelib
parent55650943492ff00d086bc76039212ce8438ee203 (diff)
downloadQt-84a342eea111f0a1da8fd0c417362aae2b851e56.zip
Qt-84a342eea111f0a1da8fd0c417362aae2b851e56.tar.gz
Qt-84a342eea111f0a1da8fd0c417362aae2b851e56.tar.bz2
Fix compilation with QT_NO_
Merge-request: 1132 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/plugin/qelfparser_p.cpp2
-rw-r--r--src/corelib/plugin/qelfparser_p.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/plugin/qelfparser_p.cpp b/src/corelib/plugin/qelfparser_p.cpp
index fc5b0d9..198c6d7 100644
--- a/src/corelib/plugin/qelfparser_p.cpp
+++ b/src/corelib/plugin/qelfparser_p.cpp
@@ -41,6 +41,7 @@
#include "qelfparser_p.h"
+#ifndef QT_NO_LIBRARY
#if defined (Q_OF_ELF) && defined(Q_CC_GNU)
#include "qlibrary_p.h"
@@ -236,3 +237,4 @@ int QElfParser::parse(const char *dataStart, ulong fdlen, const QString &library
QT_END_NAMESPACE
#endif // defined(Q_OF_ELF) && defined(Q_CC_GNU)
+#endif // QT_NO_LIBRARY
diff --git a/src/corelib/plugin/qelfparser_p.h b/src/corelib/plugin/qelfparser_p.h
index 163d2c1..3ccce10 100644
--- a/src/corelib/plugin/qelfparser_p.h
+++ b/src/corelib/plugin/qelfparser_p.h
@@ -56,6 +56,7 @@
#include <qendian.h>
#include <qglobal.h>
+#ifndef QT_NO_LIBRARY
#if defined (Q_OF_ELF) && defined(Q_CC_GNU)
QT_BEGIN_NAMESPACE
@@ -102,5 +103,6 @@ public:
QT_END_NAMESPACE
#endif // defined(Q_OF_ELF) && defined(Q_CC_GNU)
+#endif // QT_NO_LIBRARY
#endif // QELFPARSER_P_H