diff --git a/fuel.pro b/fuel.pro index 1c955c1..13b940f 100644 --- a/fuel.pro +++ b/fuel.pro @@ -105,6 +105,8 @@ HEADERS += ext/qtkeychain/keychain.h \ ext/qtkeychain/keychain_p.h \ ext/qtkeychain/qkeychain_export.h +DEFINES += QKEYCHAIN_STATICLIB + unix:!macx { QT += dbus @@ -121,6 +123,7 @@ macx { win32 { SOURCES += ext/qtkeychain/keychain_win.cpp + LIBS += -lCrypt32 } diff --git a/intl/convert.bat b/intl/convert.bat index 38950f6..276524e 100755 --- a/intl/convert.bat +++ b/intl/convert.bat @@ -16,5 +16,6 @@ REM Convert all except the en_US which is the original text in the code %QTPATH%\bin\lrelease fr_FR.ts -qm ..\rsrc\intl\fr_FR.qm %QTPATH%\bin\lrelease ru_RU.ts -qm ..\rsrc\intl\ru_RU.qm %QTPATH%\bin\lrelease pt_PT.ts -qm ..\rsrc\intl\pt_PT.qm +%QTPATH%\bin\lrelease it_IT.ts -qm ..\rsrc\intl\it_IT.qm endlocal diff --git a/manifest b/manifest index cc2e69b..bb37610 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Removed\srevision\slabel\sfrom\sstatus\sbar.\nCleaned-up\stag\slabel\n -D 2015-07-11T15:01:06.978 +C Fixed\sWindows\sbuild\n +D 2015-07-11T16:26:48.784 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b @@ -37,8 +37,8 @@ F ext/qtkeychain/qkeychain_export.h d756528188ef9bf3c4461ecc80048f06c362b54b F ext/qtkeychain/testclient.cpp cb1290a9584b627306a7bfdf1c02a8bbae503f5f F ext/qtkeychain/translations/qtkeychain_de.ts 0a70c8205c066c30ed8172f0670942de1fc5eede F ext/qtkeychain/translations/qtkeychain_ro.ts f16939382fd1a047b0692426bc82847347f14b32 -F fuel.pro a073dccc62907196355eb2eea4eb4ca07328bda5 -F intl/convert.bat 4222ae403418381452b843929d15259ea9850ab1 x +F fuel.pro 9c43639bbc1ec72fa377cd385f3cac560d6d944d +F intl/convert.bat efd797fce71fca57c9a1c5f963da1f83263f6e9a x F intl/convert.sh ac6edc8d99b575601cf9c6b85b18c9e25875b6e0 x F intl/de_DE.ts e2faceab920ac60c97bbc6fba038e261d51fc741 F intl/el_GR.ts 1b805ee57309d02059d9e3e4cb49d945f9d9ac82 @@ -253,7 +253,7 @@ F ui/MainWindow.ui 10181826a25056ed5aba2b23a7d110159be7c043 F ui/RemoteDialog.ui 95a4750d972ed8c49bb10b95db91ff16cfe2dd0b F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd F ui/SettingsDialog.ui 47b9a31e28ad523f14a1c4cd361270b6babbdf7d -P 6f96b3f7c927e06ac740b9df993a3f19d57eb74a -R ac363738e384d42ff5d3412f6b09ecc6 +P 945c7455e0fa0198d51933965cc4c332d0096a1e +R 94c0939d65ac02083adf4a26de35d271 U kostas -Z 842ad749b9d1ee8580309846bf44766b +Z e283461260ace77678cb6fc02bb37725 diff --git a/manifest.uuid b/manifest.uuid index 3dbe22c..5b03105 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -945c7455e0fa0198d51933965cc4c332d0096a1e \ No newline at end of file +c2a08cf305f24922fac8c70654d652b6477ee7b4 \ No newline at end of file