diff --git a/2048-qt.pro b/2048-qt.pro index b10d888..8029442 100644 --- a/2048-qt.pro +++ b/2048-qt.pro @@ -31,7 +31,6 @@ HEADERS += \ TRANSLATIONS = ts/2048-qt_zh_CN.ts ts/2048-qt_ru_RU.ts -VERSION = 0.1.4 +VERSION = 0.1.5 -VERSTR = '\\"$${VERSION}\\"' -DEFINES += VER=\"$${VERSTR}\" +DEFINES += APP_VERSION=\\\"$${VERSION}\\\" diff --git a/Changelog.md b/Changelog.md index b9cdf0b..e904d7c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,14 @@ # Changelog +## 2014-05-29 0.1.5 +* fixed the VERSION issue for Visual Studio +* do not translate the language names +* Merge branch 'SBasalaev-master' +* avoided trying to load English translation file +* added Russian translation +* Russian translation +* added the Debian package in README + ## 2014-05-03 0.1.4 * updated the version number * added man page and Changelog files diff --git a/README.md b/README.md index dd86b79..5a1376e 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,13 @@ And please vote it if you like it. sudo apt-get install 2048-qt ``` +### Ubuntu + +From Ubuntu 14.10 on, install it through: +``` +sudo apt-get install 2048-qt +``` + ## Todo - Allow the user to add his own label systems diff --git a/deploy_on_windows.bat b/deploy_on_windows.bat new file mode 100644 index 0000000..01011a9 --- /dev/null +++ b/deploy_on_windows.bat @@ -0,0 +1 @@ +windeployqt.exe --release --qmldir qml/ --no-translations --compiler-runtime release/2048-qt.exe diff --git a/main.cpp b/main.cpp index f44cf9d..289613a 100644 --- a/main.cpp +++ b/main.cpp @@ -10,7 +10,7 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); Settings settings(0, "xiaoyong", "2048-Qt"); - settings.setVersion(QString(VER)); + settings.setVersion(QString(APP_VERSION)); // Localization QString locale;