summaryrefslogtreecommitdiffstats
path: root/src/printsupport
diff options
context:
space:
mode:
Diffstat (limited to 'src/printsupport')
-rw-r--r--src/printsupport/CMakeLists.txt3
-rw-r--r--src/printsupport/configure.cmake2
-rw-r--r--src/printsupport/configure.json2
-rw-r--r--src/printsupport/kernel/kernel.pri6
-rw-r--r--src/printsupport/kernel/qprinter.cpp4
5 files changed, 4 insertions, 13 deletions
diff --git a/src/printsupport/CMakeLists.txt b/src/printsupport/CMakeLists.txt
index 698875e1f3..e310296002 100644
--- a/src/printsupport/CMakeLists.txt
+++ b/src/printsupport/CMakeLists.txt
@@ -53,9 +53,6 @@ qt_extend_target(PrintSupport CONDITION QT_FEATURE_printpreviewwidget
qt_extend_target(PrintSupport CONDITION WIN32
SOURCES
kernel/qprintengine_win.cpp kernel/qprintengine_win_p.h
-)
-
-qt_extend_target(PrintSupport CONDITION WIN32 AND NOT WINRT
LIBRARIES
comdlg32
gdi32
diff --git a/src/printsupport/configure.cmake b/src/printsupport/configure.cmake
index 3339d351d3..4e2bb9e7de 100644
--- a/src/printsupport/configure.cmake
+++ b/src/printsupport/configure.cmake
@@ -32,7 +32,7 @@ qt_feature("printer" PUBLIC
SECTION "Painting"
LABEL "QPrinter"
PURPOSE "Provides a printer backend of QPainter."
- CONDITION NOT UIKIT AND NOT WINRT AND QT_FEATURE_picture AND QT_FEATURE_temporaryfile AND QT_FEATURE_pdf
+ CONDITION NOT UIKIT AND QT_FEATURE_picture AND QT_FEATURE_temporaryfile AND QT_FEATURE_pdf
)
qt_feature_definition("printer" "QT_NO_PRINTER" NEGATE VALUE "1")
qt_feature("printpreviewwidget" PUBLIC
diff --git a/src/printsupport/configure.json b/src/printsupport/configure.json
index 7183d2e737..9bd85b0707 100644
--- a/src/printsupport/configure.json
+++ b/src/printsupport/configure.json
@@ -53,7 +53,7 @@
"label": "QPrinter",
"purpose": "Provides a printer backend of QPainter.",
"section": "Painting",
- "condition": "!config.uikit && !config.winrt && features.picture && features.temporaryfile && features.pdf",
+ "condition": "!config.uikit && features.picture && features.temporaryfile && features.pdf",
"output": [ "publicFeature", "feature" ]
},
"printpreviewwidget": {
diff --git a/src/printsupport/kernel/kernel.pri b/src/printsupport/kernel/kernel.pri
index 2ceaf152eb..5c0feaf7a9 100644
--- a/src/printsupport/kernel/kernel.pri
+++ b/src/printsupport/kernel/kernel.pri
@@ -33,10 +33,8 @@ win32 {
$$PWD/qprintengine_win_p.h
SOURCES += \
$$PWD/qprintengine_win.cpp
- !winrt {
- LIBS_PRIVATE += -lwinspool -lcomdlg32
- QMAKE_USE_PRIVATE += user32 gdi32
- }
+ LIBS_PRIVATE += -lwinspool -lcomdlg32
+ QMAKE_USE_PRIVATE += user32 gdi32
}
unix:!darwin:qtConfig(cups) {
diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp
index 25855d6da7..8fd98d1e4c 100644
--- a/src/printsupport/kernel/qprinter.cpp
+++ b/src/printsupport/kernel/qprinter.cpp
@@ -2233,8 +2233,4 @@ QPrinter::PrintRange QPrinter::printRange() const
QT_END_NAMESPACE
-#elif defined(Q_OS_WINRT)
-QT_BEGIN_NAMESPACE
-bool Q_PRINTSUPPORT_EXPORT qt_winrt_export_lib_creation_variable;
-QT_END_NAMESPACE
#endif // QT_NO_PRINTER