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 db89708bb733c5d3b87e332b844ac510369f5c02..1997106cf61cb5b9f62775d5063a7046a0a464bd 100644 (file)
--- 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 c42865a713cf7d42612f584c5b66e3e9ab88c6cb..b303842ca774e70fc855e484d67617336d277e11 100644 (file)
--- 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 9c58a2cab3bb5573f2a123253d06d4e932c39aa9..2cb20d4ad3a7af93502595eb44904025e1f096ca 100644 (file)
--- 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 e9327e99be41cfb10aeaaeb064f345da1f01bfd3..9fa3196b5571edb66f35eaf95374fcb89e5b06ec 100644 (file)
--- 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  #############################