From: Peter Kümmel <syntheticpp@gmx.net>
Date: Fri, 19 Oct 2007 18:45:09 +0000 (+0000)
Subject: rcc: use -name option
X-Git-Tag: 1.6.10~7761
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=04ba7e1bb28e1d75bb757a72f73b53ecf3bc4409;p=lyx.git

rcc: use -name option

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21074 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/development/cmake/modules/FindQt4.cmake b/development/cmake/modules/FindQt4.cmake
index db89708bb7..1997106cf6 100644
--- a/development/cmake/modules/FindQt4.cmake
+++ b/development/cmake/modules/FindQt4.cmake
@@ -787,7 +787,7 @@ if(QT4_QMAKE_FOUND)
       set(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx)
       ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
         COMMAND ${QT_RCC_EXECUTABLE}
-        ARGS -o ${outfile} ${infile}
+        ARGS -name ${outfilename} -o ${outfile} ${infile}
         MAIN_DEPENDENCY ${infile} )
       set(${outfiles} ${${outfiles}} ${outfile})
     ENDFOREACH (it)
diff --git a/development/scons/qt4.py b/development/scons/qt4.py
index c42865a713..b303842ca7 100644
--- a/development/scons/qt4.py
+++ b/development/scons/qt4.py
@@ -207,7 +207,7 @@ def generate(env):
 	env['QT4_UICDECLFLAGS'] = CLVar('')
 	env['QT4_MOCFROMHFLAGS'] = CLVar('')
 	env['QT4_MOCFROMCXXFLAGS'] = CLVar('-i')
-	env['QT4_QRCFLAGS'] = ''
+	env['QT4_QRCFLAGS'] = '-name Resources'
 
 	# suffixes/prefixes for the headers / sources to generate
 	env['QT4_MOCHPREFIX'] = ''
diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp
index 9c58a2cab3..2cb20d4ad3 100644
--- a/src/frontends/qt4/GuiToolbar.cpp
+++ b/src/frontends/qt4/GuiToolbar.cpp
@@ -45,10 +45,9 @@
 
 static void initializeResources()
 {
-	extern void qInitResources();
 	static bool initialized = false;
 	if (!initialized) {
-		qInitResources();
+		Q_INIT_RESOURCE(Resources); 
 		initialized = true;
 	}
 }
diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index e9327e99be..9fa3196b55 100644
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -26,7 +26,7 @@ Resources.qrc: Makefile
 	echo "</qresource></RCC>" >> $@
 
 Resources.cpp: Resources.qrc
-	$(RCC4) $< -o $@
+	$(RCC4) $< -name Resources -o $@
 
 
 #########################  LIBRARIES  #############################