From 026013e1eb6c820c062419387c778dac16ed095a Mon Sep 17 00:00:00 2001 From: Enrico Forestieri Date: Fri, 19 Oct 2007 15:16:40 +0000 Subject: [PATCH] Compile fix git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21065 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/cmake/modules/FindQt4.cmake | 2 +- src/frontends/qt4/GuiToolbar.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/development/cmake/modules/FindQt4.cmake b/development/cmake/modules/FindQt4.cmake index 1997106cf6..db89708bb7 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 -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 921c5b3f20..9c58a2cab3 100644 --- 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; } } -- 2.39.2