anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rcc: use -name option

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21074 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2007-10-19 18:45:09 +00:00
parent a46d7ee857
commit 04ba7e1bb2
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
development/cmake/modules/FindQt4.cmake
View File

@ -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)

2
development/scons/qt4.py
View File

@ -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'] = ''

3
src/frontends/qt4/GuiToolbar.cpp
View File

@ -45,10 +45,9 @@
static void initializeResources()
{
extern void qInitResources();
static bool initialized = false;
if (!initialized) {
qInitResources();
Q_INIT_RESOURCE(Resources);
initialized = true;
}
}

2
src/frontends/qt4/Makefile.am
View File

@ -26,7 +26,7 @@ Resources.qrc: Makefile
echo "</qresource></RCC>" >> $@
Resources.cpp: Resources.qrc
$(RCC4) $< -o $@
$(RCC4) $< -name Resources -o $@
######################### LIBRARIES #############################