From 72f6e3fc436b5e4f7988ffa19359bb6cff644590 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sat, 22 Jan 2011 11:56:31 +0100
Subject: Link against debug version of Qt on windows.


diff --git a/BuildTools/SCons/Tools/qt4.py b/BuildTools/SCons/Tools/qt4.py
index 0a84c03..e735fe9 100644
--- a/BuildTools/SCons/Tools/qt4.py
+++ b/BuildTools/SCons/Tools/qt4.py
@@ -469,8 +469,8 @@ def enable_modules(self, modules, debug=False, crosscompiling=False) :
 			modules.remove("QtAssistant")
 			modules.append("QtAssistantClient")
 		# FIXME: Phonon Hack
-		self.AppendUnique(LIBS=['phonon4'+debugSuffix])
-		self.AppendUnique(LIBS=[lib+'4'+debugSuffix for lib in modules if lib not in staticModules])
+		self.AppendUnique(LIBS=['phonon'+debugSuffix+'4'])
+		self.AppendUnique(LIBS=[lib+debugSuffix+'4' for lib in modules if lib not in staticModules])
 		self.PrependUnique(LIBS=[lib+debugSuffix for lib in modules if lib in staticModules])
 		if 'QtOpenGL' in modules:
 			self.AppendUnique(LIBS=['opengl32'])
diff --git a/Swift/QtUI/MUCSearch/QtMUCSearchWindow.cpp b/Swift/QtUI/MUCSearch/QtMUCSearchWindow.cpp
index f150174..3c16efb 100644
--- a/Swift/QtUI/MUCSearch/QtMUCSearchWindow.cpp
+++ b/Swift/QtUI/MUCSearch/QtMUCSearchWindow.cpp
@@ -137,6 +137,7 @@ void QtMUCSearchWindow::addService(const MUCService& service) {
 	}
 	model_->addService(serviceItem);
 	ui_.results_->expandAll();
+
 }
 
 void QtMUCSearchWindow::setSearchInProgress(bool searching) {
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index b0072a6..306cdf8 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -48,7 +48,7 @@ myenv.Tool("nsis", toolpath = ["#/BuildTools/SCons/Tools"])
 qt4modules = ['QtCore', 'QtGui', 'QtWebKit']
 if env["PLATFORM"] == "posix" :
 	qt4modules += ["QtDBus"]
-myenv.EnableQt4Modules(qt4modules, debug = False)
+myenv.EnableQt4Modules(qt4modules, debug = env["debug"])
 
 myenv.Append(CPPPATH = ["."])
 
-- 
cgit v0.10.2-6-g49f6