Compile fix

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

diff --git a/development/cmake/modules/FindQt4.cmake b/development/cmake/modules/FindQt4.cmake
index 1997106cf61cb5b9f62775d5063a7046a0a464bd..db89708bb733c5d3b87e332b844ac510369f5c02 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 -name ${outfilename} -o ${outfile} ${infile}
+        ARGS -o ${outfile} ${infile}
         MAIN_DEPENDENCY ${infile} )
       set(${outfiles} ${${outfiles}} ${outfile})
     ENDFOREACH (it)

diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp
index 921c5b3f20082c0e018a0da6e41f89c95a09895b..9c58a2cab3bb5573f2a123253d06d4e932c39aa9 100644 (file)
--- a/src/frontends/qt4/GuiToolbar.cpp
+++ b/src/frontends/qt4/GuiToolbar.cpp
@@ -45,9 +45,10 @@
 
 static void initializeResources()
 {
+       extern void qInitResources();
        static bool initialized = false;
        if (!initialized) {
-               Q_INIT_RESOURCE(Resources);
+               qInitResources();
                initialized = true;
        }
 }