1 files changed, 40 insertions, 0 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 64c3b15..4ab6792 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -20,7 +20,12 @@ def generateDefaultTheme(dir) :
 Import("env")
 
 myenv = env.Clone()
+
+# Disable warnings that affect Qt
 myenv["CXXFLAGS"] = filter(lambda x : x != "-Wfloat-equal", myenv["CXXFLAGS"])
+if "clang" in env["CC"] :
+	myenv.Append(CXXFLAGS = ["-Wno-float-equal", "-Wno-shorten-64-to-32", "-Wno-missing-prototypes", "-Wno-unreachable-code", "-Wno-disabled-macro-expansion", "-Wno-unused-private-field", "-Wno-extra-semi", "-Wno-duplicate-enum", "-Wno-missing-variable-declarations", "-Wno-conversion"])
+
 myenv.UseFlags(env["SWIFT_CONTROLLERS_FLAGS"])
 myenv.UseFlags(env["SWIFTOOLS_FLAGS"])
 if myenv["HAVE_XSS"] :
@@ -107,6 +112,11 @@ sources = [
     "QtEditBookmarkWindow.cpp",
     "QtContactEditWindow.cpp",
     "QtContactEditWidget.cpp",
+    "QtSingleWindow.cpp",
+    "QtHighlightEditorWidget.cpp",
+    "QtHighlightRulesItemModel.cpp",
+    "QtHighlightRuleWidget.cpp",
+    "QtColorToolButton.cpp",
     "ChatSnippet.cpp",
     "MessageSnippet.cpp",
     "SystemMessageSnippet.cpp",
@@ -165,6 +175,34 @@ sources = [
     "QtURLValidator.cpp"
   ]
 
+# QtVCardWidget
+sources.extend([
+	"QtVCardWidget/QtCloseButton.cpp",
+	"QtVCardWidget/QtRemovableItemDelegate.cpp",
+	"QtVCardWidget/QtResizableLineEdit.cpp",
+	"QtVCardWidget/QtTagComboBox.cpp",
+	"QtVCardWidget/QtVCardHomeWork.cpp",
+	"QtVCardWidget/QtVCardAddressField.cpp",
+	"QtVCardWidget/QtVCardAddressLabelField.cpp",
+	"QtVCardWidget/QtVCardBirthdayField.cpp",
+	"QtVCardWidget/QtVCardDescriptionField.cpp",
+	"QtVCardWidget/QtVCardInternetEMailField.cpp",
+	"QtVCardWidget/QtVCardJIDField.cpp",
+	"QtVCardWidget/QtVCardOrganizationField.cpp",
+	"QtVCardWidget/QtVCardPhotoAndNameFields.cpp",
+	"QtVCardWidget/QtVCardRoleField.cpp",
+	"QtVCardWidget/QtVCardTelephoneField.cpp",
+	"QtVCardWidget/QtVCardTitleField.cpp",
+	"QtVCardWidget/QtVCardURLField.cpp",
+	"QtVCardWidget/QtVCardGeneralField.cpp",
+	"QtVCardWidget/QtVCardWidget.cpp"
+])
+
+myenv.Uic4("QtVCardWidget/QtVCardPhotoAndNameFields.ui")
+myenv.Uic4("QtVCardWidget/QtVCardWidget.ui")
+myenv.Uic4("QtProfileWindow.ui")
+
+
 # Determine the version
 myenv["SWIFT_VERSION"] = Version.getBuildVersion(env.Dir("#").abspath, "swift")
 if env["PLATFORM"] == "win32" :
@@ -225,6 +263,8 @@ myenv.Uic4("QtAffiliationEditor.ui")
 myenv.Uic4("QtJoinMUCWindow.ui")
 myenv.Uic4("QtHistoryWindow.ui")
 myenv.Uic4("QtConnectionSettings.ui")
+myenv.Uic4("QtHighlightRuleWidget.ui")
+myenv.Uic4("QtHighlightEditorWidget.ui")
 myenv.Qrc("DefaultTheme.qrc")
 myenv.Qrc("Swift.qrc")