From 7b37d1bc4f6b27188b0688dcdc2b89db3101575c Mon Sep 17 00:00:00 2001 From: Fathi Boudra Date: Fri, 20 Feb 2009 20:24:25 +0000 Subject: Merge Qt4 4.5 branch to trunk. --- debian/patches/02_launch_assistant-qt4.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/patches/02_launch_assistant-qt4.diff') diff --git a/debian/patches/02_launch_assistant-qt4.diff b/debian/patches/02_launch_assistant-qt4.diff index f086432..44ee566 100644 --- a/debian/patches/02_launch_assistant-qt4.diff +++ b/debian/patches/02_launch_assistant-qt4.diff @@ -1,6 +1,6 @@ --- a/demos/qtdemo/menumanager.cpp +++ b/demos/qtdemo/menumanager.cpp -@@ -285,7 +285,7 @@ void MenuManager::showDocInAssistant(con +@@ -284,7 +284,7 @@ void MenuManager::showDocInAssistant(con if (this->assistantProcess.state() != QProcess::Running){ QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator(); #if !defined(Q_OS_MAC) -- cgit v1.2.3