Swift
summaryrefslogtreecommitdiffstats
path: root/Swift/QtUI
diff options
context:
space:
mode:
Diffstat (limited to 'Swift/QtUI')
-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
@@ -203,10 +203,13 @@ sources = [
203 "Trellis/QtDynamicGridLayout.cpp", 203 "Trellis/QtDynamicGridLayout.cpp",
204 "Trellis/QtDNDTabBar.cpp", 204 "Trellis/QtDNDTabBar.cpp",
205 "Trellis/QtGridSelectionDialog.cpp" 205 "Trellis/QtGridSelectionDialog.cpp"
206] 206]
207 207
208if env["PLATFORM"] == "win32" :
209 sources.extend(["qrc_SwiftWindows.cc"])
210
208# QtVCardWidget 211# QtVCardWidget
209sources.extend([ 212sources.extend([
210 "QtVCardWidget/QtCloseButton.cpp", 213 "QtVCardWidget/QtCloseButton.cpp",
211 "QtVCardWidget/QtRemovableItemDelegate.cpp", 214 "QtVCardWidget/QtRemovableItemDelegate.cpp",
212 "QtVCardWidget/QtResizableLineEdit.cpp", 215 "QtVCardWidget/QtResizableLineEdit.cpp",
@@ -298,10 +301,13 @@ myenv.Uic4("QtHighlightEditor.ui")
298myenv.Uic4("QtBlockListEditorWindow.ui") 301myenv.Uic4("QtBlockListEditorWindow.ui")
299myenv.Uic4("QtSpellCheckerWindow.ui") 302myenv.Uic4("QtSpellCheckerWindow.ui")
300myenv.Qrc("DefaultTheme.qrc") 303myenv.Qrc("DefaultTheme.qrc")
301myenv.Qrc("Swift.qrc") 304myenv.Qrc("Swift.qrc")
302 305
306if env["PLATFORM"] == "win32" :
307 myenv.Qrc("SwiftWindows.qrc")
308
303# Resources 309# Resources
304commonResources = { 310commonResources = {
305 "": ["#/Swift/resources/sounds"] 311 "": ["#/Swift/resources/sounds"]
306} 312}
307 313
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,9 +1,8 @@
1<!DOCTYPE RCC> 1<!DOCTYPE RCC>
2<RCC version="1.0"> 2<RCC version="1.0">
3 <qresource> 3 <qresource>
4 <file alias="qt/etc/qt.conf">qt.conf</file>
5 <file alias="logo-icon-16.png">../resources/logo/logo-icon-16.png</file> 4 <file alias="logo-icon-16.png">../resources/logo/logo-icon-16.png</file>
6 <file alias="logo-chat-16.png">../resources/logo/logo-chat-16.png</file> 5 <file alias="logo-chat-16.png">../resources/logo/logo-chat-16.png</file>
7 <file alias="logo-shaded-text.256.png">../resources/logo/logo-shaded-text.256.png</file> 6 <file alias="logo-shaded-text.256.png">../resources/logo/logo-shaded-text.256.png</file>
8 <file alias="icons/online.png">../resources/icons/online.png</file> 7 <file alias="icons/online.png">../resources/icons/online.png</file>
9 <file alias="icons/connecting.mng">../resources/icons/connecting.mng</file> 8 <file alias="icons/connecting.mng">../resources/icons/connecting.mng</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 @@
1<!DOCTYPE RCC>
2<RCC version="1.0">
3 <qresource>
4 <file alias="qt/etc/qt.conf">qt-windows.conf</file>
5 </qresource>
6</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