diff -r 02a1dd166f2b -r a03989fb355a platformthemes.pro --- a/platformthemes.pro Tue Jul 06 14:53:09 2010 +0300 +++ b/platformthemes.pro Tue Jul 13 20:12:19 2010 +0300 @@ -36,6 +36,9 @@ } HB_THEMES_DIR = $$HB_THEMES_DIR/themes +# ============================================================================ +# determine dir separators & /dev/null +# ============================================================================ win32:!win32-g++ { unixstyle = false } else:symbian:isEmpty(QMAKE_SH) { @@ -80,15 +83,15 @@ error(\'$$THEMEINDEXER\' must be in PATH.) } } -ARGS = -s $$OUT_PWD/tmp/src -t $$OUT_PWD/tmp +ARGS = -s $$OUT_PWD/tmp/src -t $$OUT_PWD/tmp/src !system($$THEMEINDEXER $$ARGS) { error(*** $$THEMEINDEXER reported an error. Stop.) } index.path = $$(HB_THEMES_DIR)/themes -index.files = $$OUT_PWD/tmp/*.themeindex +index.files = $$OUT_PWD/tmp/src/*.themeindex INSTALLS += index -QMAKE_CLEAN += $$OUT_PWD/tmp/*.themeindex +QMAKE_CLEAN += $$OUT_PWD/tmp/src/*.themeindex # ============================================================================ # generate installs.pri @@ -98,7 +101,6 @@ error(*** bin/installs.py reported an error. Stop.) } isEmpty(QMAKE_UNZIP):QMAKE_UNZIP = unzip -u -o -include($$OUT_PWD/tmp/installs.pri) QMAKE_DISTCLEAN += $$OUT_PWD/tmp/installs.pri # ============================================================================ @@ -110,6 +112,7 @@ error(*** bin/rom.py reported an error. Stop.) } QMAKE_CLEAN += $$OUT_PWD/tmp/*.iby + QMAKE_CLEAN += $$OUT_PWD/tmp/*.thx } # ============================================================================ @@ -140,13 +143,11 @@ return(true) } exportThemeFiles($$files($$OUT_PWD/tmp/*.iby), $$CORE_MW_LAYER_IBY_EXPORT_PATH()) - exportThemeFiles($$files($$OUT_PWD/tmp/*.themeindex), $${EPOCROOT}epoc32/data/z/resource/hb/themes/) - exportThemeFiles($$files($$OUT_PWD/tmp/*.themeindex), $${EPOCROOT}epoc32/winscw/c/resource/hb/themes/) + exportThemeFiles($$files($$OUT_PWD/tmp/*.thx), $${EPOCROOT}epoc32/data/z/resource/hb/themes/) + exportThemeFiles($$files($$OUT_PWD/tmp/src/*.themeindex), $${EPOCROOT}epoc32/winscw/c/resource/hb/themes/) - # configuration files - exporting removed from platformthemes -# BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/confml/confml/hbtheme.confml MW_LAYER_CONFML(hbtheme.confml) -# BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/confml/implml/hbtheme_20022e82.crml MW_LAYER_CRML(hbtheme_20022e82.crml) -# BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/confml/implml/hbtheme.implml MW_LAYER_CRML(hbtheme.implml) + # configuration files + BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/confml/platformthemes.confml MW_LAYER_CONFML(platformthemes.confml) } else { exists(src/theme.theme) { @@ -166,3 +167,4 @@ } message(Run \'make install\') +include($$OUT_PWD/tmp/installs.pri)