Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-09-07 10:12:08 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-09-16 19:53:32 (GMT) |
| commit | fbd725fecfc34aa86862d11163b37172edc60e6b (patch) | |
| tree | 28a2a5bc10594b3b5489ffcae332133070e940a3 | |
| parent | 8de649a83747bcb59a497fe1aeddd61b00ad0c05 (diff) | |
| download | swift-fbd725fecfc34aa86862d11163b37172edc60e6b.zip swift-fbd725fecfc34aa86862d11163b37172edc60e6b.tar.bz2 | |
Only put qt.conf as resource binary for Windows builds
Commit 22ea5735ad1a105a4294b7475aba58646ef3ee8a added a qt.conf
file to the compiled binary resources of Swift which is picked up
by Qt and configures Qt to disable DPI awareness on Windows, as it
is not supported by the Qt WebKit widgets yet.
However, the Mac application bundle also ships with a qt.conf
file which set the correct folders for Qt plugins. This was
overridden by the compiled qt.conf resource file.
This commit only compiles the qt.conf resoruce file require for
Windows on the Windows platform.
Test-Information:
Tested on Windows 10 with 150% scaling that Swift is scaled up
based on the pixel data.
Tested on OS X 10.9.5 that the installation package works again.
Change-Id: I74ce722cff1090e7dafc3a67e04f2a45d375a43d
| -rw-r--r-- | Swift/QtUI/SConscript | 6 | ||||
| -rw-r--r-- | Swift/QtUI/Swift.qrc | 1 | ||||
| -rw-r--r-- | Swift/QtUI/SwiftWindows.qrc | 6 | ||||
| -rw-r--r-- | Swift/QtUI/qt-windows.conf (renamed from Swift/QtUI/qt.conf) | 0 |
4 files changed, 12 insertions, 1 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript index e7fe93f..78d6b3e 100644 --- a/Swift/QtUI/SConscript +++ b/Swift/QtUI/SConscript @@ -205,6 +205,9 @@ sources = [ "Trellis/QtGridSelectionDialog.cpp" ] +if env["PLATFORM"] == "win32" : + sources.extend(["qrc_SwiftWindows.cc"]) + # QtVCardWidget sources.extend([ "QtVCardWidget/QtCloseButton.cpp", @@ -300,6 +303,9 @@ myenv.Uic4("QtSpellCheckerWindow.ui") myenv.Qrc("DefaultTheme.qrc") myenv.Qrc("Swift.qrc") +if env["PLATFORM"] == "win32" : + myenv.Qrc("SwiftWindows.qrc") + # Resources commonResources = { "": ["#/Swift/resources/sounds"] diff --git a/Swift/QtUI/Swift.qrc b/Swift/QtUI/Swift.qrc index a3a95cc..eeef80d 100644 --- a/Swift/QtUI/Swift.qrc +++ b/Swift/QtUI/Swift.qrc @@ -1,7 +1,6 @@ <!DOCTYPE RCC> <RCC version="1.0"> <qresource> - <file alias="qt/etc/qt.conf">qt.conf</file> <file alias="logo-icon-16.png">../resources/logo/logo-icon-16.png</file> <file alias="logo-chat-16.png">../resources/logo/logo-chat-16.png</file> <file alias="logo-shaded-text.256.png">../resources/logo/logo-shaded-text.256.png</file> diff --git a/Swift/QtUI/SwiftWindows.qrc b/Swift/QtUI/SwiftWindows.qrc new file mode 100644 index 0000000..72e50d3 --- /dev/null +++ b/Swift/QtUI/SwiftWindows.qrc @@ -0,0 +1,6 @@ +<!DOCTYPE RCC> +<RCC version="1.0"> + <qresource> + <file alias="qt/etc/qt.conf">qt-windows.conf</file> + </qresource> +</RCC> diff --git a/Swift/QtUI/qt.conf b/Swift/QtUI/qt-windows.conf index 2620cdc..2620cdc 100644 --- a/Swift/QtUI/qt.conf +++ b/Swift/QtUI/qt-windows.conf |