summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Swift/QtUI/SConscript6
-rw-r--r--Swift/QtUI/Swift.qrc1
-rw-r--r--Swift/QtUI/SwiftWindows.qrc6
-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