From f85308bbe6955c365fbfaede3187b90a8174dfda Mon Sep 17 00:00:00 2001 From: Thomas Walpole Date: Thu, 2 Nov 2017 14:09:12 -0700 Subject: [PATCH] only override font in Qt versions where it's needed --- spec/driver_spec.rb | 3 +++ src/WebPage.cpp | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/spec/driver_spec.rb b/spec/driver_spec.rb index 1f93038..ed9145d 100644 --- a/spec/driver_spec.rb +++ b/spec/driver_spec.rb @@ -2069,14 +2069,17 @@ describe Capybara::Webkit::Driver do end it "ignores custom fonts" do + skip "font replacement not needed for QT >= 5" unless driver.version =~ /Qt: 4/ expect(font_family).to eq "Arial" end it "ignores custom fonts before an element" do + skip "font replacement not needed for QT >= 5" unless driver.version =~ /Qt: 4/ expect(font_family).to eq "Arial" end it "ignores custom fonts after an element" do + skip "font replacement not needed for QT >= 5" unless driver.version =~ /Qt: 4/ expect(font_family).to eq "Arial" end end diff --git a/src/WebPage.cpp b/src/WebPage.cpp index a77db6f..4fd7213 100644 --- a/src/WebPage.cpp +++ b/src/WebPage.cpp @@ -25,7 +25,10 @@ WebPage::WebPage(WebPageManager *manager, QObject *parent) : QWebPage(parent) { setForwardUnsupportedContent(true); loadJavascript(); - setUserStylesheet(); + + #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) + setUserStylesheet(); + #endif this->setCustomNetworkAccessManager();