diff --git a/build_num b/build_num index 81f6dc017..cead24d4c 100644 --- a/build_num +++ b/build_num @@ -1 +1 @@ -#define BUILD_NUM 2262 +#define BUILD_NUM 2263 diff --git a/qmake.inc.in b/qmake.inc.in index d6019f7e8..ff10ee272 100644 --- a/qmake.inc.in +++ b/qmake.inc.in @@ -55,6 +55,7 @@ unix { res_help_C.path = $$res.path/help/C res_help_en_US.path = $$res.path/help/en_US res_desktop.path = @DATADIR@/applications/ + res_configlets.path = $$res.path/configlets INSTALLS += res INSTALLS += res_os diff --git a/src/res/res.pro b/src/res/res.pro index aec749e43..89ca5d9c6 100644 --- a/src/res/res.pro +++ b/src/res/res.pro @@ -11,6 +11,7 @@ win32 { QMAKE_RUN_CC = echo QMAKE_RUN_CXX = echo QMAKE_LINK = echo + QMAKE_COPY_DIR = C:\Windows\System32\xcopy /I /Y /S /Q } !win32 { @@ -30,11 +31,16 @@ res_os.files = os/*.xml res_platform.files = platform/*.xml res_help_en_US.files = help/en_US/*.html help/en_US/*.png help/en_US/*.jpg + unix { - res_configlets.path = $$res.path/configlets res_configlets.files = $$system(find configlets/* -path \'*/.svn*\' -prune -o -type d -print) } +win32 { + res_configlets.files = configlets/* +# res_configlets.files = $$system(dir /B configlets) +} + INSTALLS -= target INSTALLS += res INSTALLS += res_os