[PATCH 2 of 2] (Issue10) Force encoding to be latin-1 during installer creation
Wald Commits
scm-commit at wald.intevation.org
Thu Jul 24 16:30:15 CEST 2014
# HG changeset patch
# User Andre Heinecke <andre.heinecke at intevation.de>
# Date 1406212210 -7200
# Node ID 170b13ea05ee0c96690f24d93c2ecf25bc3737e3
# Parent 747a48996c1f74df721a4379a5f5a39bf2f28e01
(Issue10) Force encoding to be latin-1 during installer creation.
diff -r 747a48996c1f -r 170b13ea05ee packaging/tmp-createpackage.sh.in
--- a/packaging/tmp-createpackage.sh.in Thu Jul 24 15:59:00 2014 +0200
+++ b/packaging/tmp-createpackage.sh.in Thu Jul 24 16:30:10 2014 +0200
@@ -29,6 +29,6 @@
-Dproductname="TrustBridge" \
-Dpath_sep="/" \
-Dinfo_url="https://wald.intevation.org/projects/trustbridge/" \
- -dsize=$EST_SIZE \
+ -Dsize=$EST_SIZE \
-Dproductname_short="TrustBridge" @CMAKE_SOURCE_DIR@/packaging/trustbridge.nsi
rm -r $TMPDIR
diff -r 747a48996c1f -r 170b13ea05ee ui/administrator.cpp
--- a/ui/administrator.cpp Thu Jul 24 15:59:00 2014 +0200
+++ b/ui/administrator.cpp Thu Jul 24 16:30:10 2014 +0200
@@ -13,6 +13,7 @@
#include <QSettings>
#include <QTranslator>
#include <QDebug>
+#include <QTextCodec>
#ifndef VERSION
#define VERSION "0.0.1"
@@ -66,6 +67,10 @@
}
app.installTranslator(&translator);
+ /* Out of process calls need to be encoded in latin-1 so that they
+ * look decent on western europe's windows */
+ QTextCodec::setCodecForLocale(QTextCodec::codecForName ("ISO-8859-1"));
+
AdministratorWindow adminWin;
adminWin.show();
More information about the Trustbridge-commits
mailing list