4 files changed, 18 insertions, 3 deletions

diff --git a/src/kvilib/kvilib_QT4_vc05.vcproj b/src/kvilib/kvilib_QT4_vc05.vcproj
index a7de8633e..99fc0582b 100644
--- a/src/kvilib/kvilib_QT4_vc05.vcproj
+++ b/src/kvilib/kvilib_QT4_vc05.vcproj
@@ -132,7 +132,7 @@
 				OmitFramePointers="true"

 				AdditionalIncludeDirectories=""$(ProjectDir)\tal";"$(ProjectDir)\system";"$(ProjectDir)\irc";"$(ProjectDir)\file";"$(ProjectDir)\ext";"$(ProjectDir)\net";"$(ProjectDir)\core\wstring";"$(ProjectDir)\core";"$(ProjectDir)\config";"$(SSLINCDIR)";"$(QTDIR)\include\";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";"$(ZLIBINCDIR)""

 				PreprocessorDefinitions="WIN32;QT3_SUPPORT;NDEBUG;_WINDOWS;_USRDLL;KVILIB_EXPORTS;_CRT_SECURE_NO_DEPRECATE"

-				MinimalRebuild="true"

+				MinimalRebuild="false"

 				ExceptionHandling="1"

 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

@@ -158,7 +158,7 @@
 				GenerateManifest="true"

 				IgnoreAllDefaultLibraries="false"

 				SubSystem="2"

-				OptimizeReferences="2"

+				OptimizeReferences="0"

 				TurnOffAssemblyGeneration="true"

 				ImportLibrary="$(OutDir)/kvilib.lib"

 				TargetMachine="1"

diff --git a/src/kvirc/ui/kvi_optionswidget.cpp b/src/kvirc/ui/kvi_optionswidget.cpp
index e3dc89a3b..ed275ec3e 100644
--- a/src/kvirc/ui/kvi_optionswidget.cpp
+++ b/src/kvirc/ui/kvi_optionswidget.cpp
@@ -628,6 +628,9 @@ void KviOptionsWidget::addRowSpacer(int x1,int y1,int x2,int y2)
 QLabel * KviOptionsWidget::addLabel(int x1,int y1,int x2,int y2,const QString & text,bool bEnabled)
 {
 	QLabel * l = new QLabel(text,this);
+#ifdef COMPILE_USE_QT4
+	l->setWordWrap(true);
+#endif
 	l->setEnabled(bEnabled);
 	addWidgetToLayout(l,x1,y1,x2,y2);
 	return l;
@@ -636,6 +639,9 @@ QLabel * KviOptionsWidget::addLabel(int x1,int y1,int x2,int y2,const QString &
 QLabel * KviOptionsWidget::addLabel(QWidget * pParent,const QString & text,bool bEnabled)
 {
 	QLabel * l = new QLabel(text,pParent);
+#ifdef COMPILE_USE_QT4
+	l->setWordWrap(true);
+#endif
 	l->setEnabled(bEnabled);
 	return l;
 }
diff --git a/src/modules/dcc/dialogs.cpp b/src/modules/dcc/dialogs.cpp
index 639132c7d..c999e53bb 100644
--- a/src/modules/dcc/dialogs.cpp
+++ b/src/modules/dcc/dialogs.cpp
@@ -55,6 +55,9 @@ KviDccAcceptBox::KviDccAcceptBox(KviDccBroker * br,KviDccDescriptor * dcc,const
 {
 	QVBoxLayout * vb = new QVBoxLayout(this,4,4);
 	QLabel * l = new QLabel(text,this);
+#ifdef COMPILE_USE_QT4
+	l->setWordWrap(true);
+#endif
 	vb->addWidget(l);
 	QHBoxLayout *hb = new QHBoxLayout(4);
 	vb->addLayout(hb,Qt::AlignCenter);
@@ -115,6 +118,9 @@ KviDccRenameBox::KviDccRenameBox(KviDccBroker * br,KviDccDescriptor * dcc,const
 {
 	QVBoxLayout * vb = new QVBoxLayout(this,4,4);
 	QLabel * l = new QLabel(text,this);
+#ifdef COMPILE_USE_QT4
+	l->setWordWrap(true);
+#endif
 	vb->addWidget(l);
 
 	QHBoxLayout *hb = new QHBoxLayout(4);
diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp
index b9f4caa4a..8201e3a55 100644
--- a/src/modules/setup/setupwizard.cpp
+++ b/src/modules/setup/setupwizard.cpp
@@ -100,6 +100,9 @@ KviSetupPage::KviSetupPage(KviSetupWizard * w)
 	l->setText(szHeader);
 
 	m_pTextLabel = new QLabel(m_pVBox);
+#ifdef COMPILE_USE_QT4
+	m_pTextLabel->setWordWrap(true);
+#endif
 	m_pTextLabel->setAlignment(Qt::AlignJustify | Qt::AlignVCenter);
 	m_pVBox->setStretchFactor(m_pTextLabel,1);
 }
@@ -233,7 +236,7 @@ KviSetupWizard::KviSetupWizard()
 	
 	QLabel* l = new QLabel(m_pDirButtonGroup);
 	l->setText(__tr2qs("Settings folder:"));
-	
+
 	m_pNewPathBox = new KviTalHBox(m_pDirButtonGroup);
 	m_pDataPathEdit = new QLineEdit(m_pNewPathBox);