summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2016-10-27 09:09:58 +0200
committerLars Knoll <lars.knoll@qt.io>2016-11-11 17:04:47 +0000
commit0038b400530e2459a2aa89576aa245007962a1c9 (patch)
tree896a8452fd1aba47d2ce14b5fad58151f00e0ed9 /src
parent467b15a20c3d6eb611ea5f6ccffd5fc0df81b0c4 (diff)
Unbreak a couple of configurations
Fix compilation with topleveldomain, textodfwriter and cssparser features disabled. Change-Id: I3f061fb09eef36cd640256a46cf77dde85a54d3d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/io/qurl.cpp2
-rw-r--r--src/gui/painting/painting.pri6
-rw-r--r--src/gui/text/text.pri24
-rw-r--r--src/network/access/qnetworkcookiejar.cpp2
4 files changed, 26 insertions, 8 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index b7762c2ae6..5b34813a71 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -410,7 +410,9 @@
#include "qhash.h"
#include "qdir.h" // for QDir::fromNativeSeparators
#include "qdatastream.h"
+#if QT_CONFIG(topleveldomain)
#include "qtldurl_p.h"
+#endif
#include "private/qipaddress_p.h"
#include "qurlquery.h"
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
index a61865a0b6..33db1ea0b4 100644
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
@@ -65,7 +65,6 @@ SOURCES += \
painting/qcolor.cpp \
painting/qcompositionfunctions.cpp \
painting/qcosmeticstroker.cpp \
- painting/qcssutil.cpp \
painting/qdrawhelper.cpp \
painting/qemulationpaintengine.cpp \
painting/qgammatables.cpp \
@@ -104,6 +103,11 @@ darwin {
SOURCES += painting/qcoregraphics.mm
}
+qtConfig(cssparser) {
+ SOURCES += \
+ painting/qcssutil.cpp
+}
+
SSE2_SOURCES += painting/qdrawhelper_sse2.cpp
SSSE3_SOURCES += painting/qdrawhelper_ssse3.cpp
SSE4_1_SOURCES += painting/qdrawhelper_sse4.cpp \
diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri
index c1c52f2d1a..a15793ec2f 100644
--- a/src/gui/text/text.pri
+++ b/src/gui/text/text.pri
@@ -32,11 +32,7 @@ HEADERS += \
text/qtextlist.h \
text/qsyntaxhighlighter.h \
text/qtextdocumentwriter.h \
- text/qcssparser_p.h \
text/qtexttable_p.h \
- text/qzipreader_p.h \
- text/qzipwriter_p.h \
- text/qtextodfwriter_p.h \
text/qstatictext_p.h \
text/qstatictext.h \
text/qrawfont.h \
@@ -70,9 +66,6 @@ SOURCES += \
text/qtextlist.cpp \
text/qtextdocumentwriter.cpp \
text/qsyntaxhighlighter.cpp \
- text/qcssparser.cpp \
- text/qzip.cpp \
- text/qtextodfwriter.cpp \
text/qstatictext.cpp \
text/qrawfont.cpp \
text/qglyphrun.cpp \
@@ -93,3 +86,20 @@ qtConfig(harfbuzz)|qtConfig(system-harfbuzz) {
SOURCES += text/qharfbuzzng.cpp
HEADERS += text/qharfbuzzng_p.h
}
+
+qtConfig(textodfwriter) {
+ HEADERS += \
+ text/qtextodfwriter_p.h \
+ text/qzipreader_p.h \
+ text/qzipwriter_p.h
+ SOURCES += \
+ text/qtextodfwriter.cpp \
+ text/qzip.cpp
+}
+
+qtConfig(cssparser) {
+ HEADERS += \
+ text/qcssparser_p.h
+ SOURCES += \
+ text/qcssparser.cpp
+}
diff --git a/src/network/access/qnetworkcookiejar.cpp b/src/network/access/qnetworkcookiejar.cpp
index 0540cb740f..232c2b47a5 100644
--- a/src/network/access/qnetworkcookiejar.cpp
+++ b/src/network/access/qnetworkcookiejar.cpp
@@ -43,7 +43,9 @@
#include "QtNetwork/qnetworkcookie.h"
#include "QtCore/qurl.h"
#include "QtCore/qdatetime.h"
+#if QT_CONFIG(topleveldomain)
#include "private/qtldurl_p.h"
+#endif
QT_BEGIN_NAMESPACE