Description: Fix --encoding option
Author: Emmanuel Bouthenot <kolter@openics.org>
Forwarded: not-needed
Last-Update: 2010-10-12
--- a/src/pageconverter.cc
+++ b/src/pageconverter.cc
@@ -59,14 +59,14 @@
 	phaseDescriptions.push_back("Resolving links");
 	phaseDescriptions.push_back("Counting pages");
 	phaseDescriptions.push_back("Loading headers and footers");
-	if (!settings.defaultEncoding.isEmpty())
-		QWebSettings::globalSettings()->setDefaultTextEncoding(settings.defaultEncoding);
 	if (!settings.enableIntelligentShrinking) {
 		QWebSettings::globalSettings()->setPrintingMaximumShrinkFactor(1.0);
 		QWebSettings::globalSettings()->setPrintingMinimumShrinkFactor(1.0);
 	}
 	QWebSettings::globalSettings()->setPrintingMediaType(settings.printMediaType?"print":"screen");
 #else
+	if (!settings.defaultEncoding.isEmpty())
+		QWebSettings::globalSettings()->setDefaultTextEncoding(settings.defaultEncoding);
 	phaseDescriptions.push_back("Loading page");
 #endif
 	phaseDescriptions.push_back("Printing pages");
