get rid of QT_LINUXBASE

note that arpa/inet.h is included in qnet_unix_p header unconditionally

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/core/global/qglobal.h b/src/core/global/qglobal.h
index f450f5d..90704b9 100644 (file)
--- a/src/core/global/qglobal.h
+++ b/src/core/global/qglobal.h
@@ -195,13 +195,6 @@ QT_USE_NAMESPACE
 #define Q_WS_X11
 #define Q_OS_UNIX
 
-#if defined(__LSB_VERSION__)
-#  if __LSB_VERSION__ < 40
-#    error "This version of the Linux Standard Base is unsupported"
-#  endif
-#  define QT_LINUXBASE
-#endif
-
 /*
    The compiler, must be one of: (Q_CC_x)
 

diff --git a/src/gui/painting/qcups.cpp b/src/gui/painting/qcups.cpp
index 88bcaf2..5d9e04c 100644 (file)
--- a/src/gui/painting/qcups.cpp
+++ b/src/gui/painting/qcups.cpp
@@ -35,9 +35,6 @@
 
 #ifndef QT_NO_CUPS
 
-#ifndef QT_LINUXBASE // LSB merges everything into cups.h
-# include <cups/language.h>
-#endif
 #include "qtextcodec.h"
 
 QT_BEGIN_NAMESPACE

diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp
index 132b02a..411c592 100644 (file)
--- a/src/network/kernel/qhostaddress.cpp
+++ b/src/network/kernel/qhostaddress.cpp
@@ -38,13 +38,12 @@
 #include "qstringlist.h"
 #include "qendian.h"
 #include "qnativesocketengine_p.h"
+
 #ifndef QT_NO_DATASTREAM
 #include "qdatastream.h"
 #endif
 
-#ifdef QT_LINUXBASE
-#  include <arpa/inet.h>
-#endif
+#include <arpa/inet.h>
 
 QT_BEGIN_NAMESPACE
 

diff --git a/src/network/kernel/qnetworkinterface_unix.cpp b/src/network/kernel/qnetworkinterface_unix.cpp
index 9decf1c..7285515 100644 (file)
--- a/src/network/kernel/qnetworkinterface_unix.cpp
+++ b/src/network/kernel/qnetworkinterface_unix.cpp
@@ -36,29 +36,26 @@
 #include "qnetworkinterface_p.h"
 #include "qalgorithms.h"
 #include "qnet_unix_p.h"
+#include "qplatformdefs.h"
 
 #ifndef QT_NO_NETWORKINTERFACE
 
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <net/if.h>
+#include <arpa/inet.h>
 
 #ifdef Q_OS_SOLARIS
 # include <sys/sockio.h>
 #endif
-#include <net/if.h>
 
 #ifdef QT_HAVE_GETIFADDRS
 # include <ifaddrs.h>
 #endif
 
-#ifdef QT_LINUXBASE
-#  include <arpa/inet.h>
-#  ifndef SIOCGIFBRDADDR
-#    define SIOCGIFBRDADDR 0x8919
-#  endif
-#endif // QT_LINUXBASE
-
-#include <qplatformdefs.h>
+#ifndef SIOCGIFBRDADDR
+#  define SIOCGIFBRDADDR 0x8919
+#endif
 
 QT_BEGIN_NAMESPACE
 

diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp
index 30c2cdd..55640e1 100644 (file)
--- a/src/network/socket/qnativesocketengine_unix.cpp
+++ b/src/network/socket/qnativesocketengine_unix.cpp
@@ -45,15 +45,12 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <netinet/tcp.h>
+#include <arpa/inet.h>
 
 #ifndef QT_NO_IPV6IFNAME
 #include <net/if.h>
 #endif
 
-#ifdef QT_LINUXBASE
-#include <arpa/inet.h>
-#endif
-
 #ifdef Q_OS_SOLARIS
 #  include <sys/filio.h> // FIONREAD
 #endif