diff options
| author | jihye <jihye424.kim@samsung.com> | 2016-09-26 18:19:00 +0900 |
|---|---|---|
| committer | JiHye Kim <jihye424.kim@samsung.com> | 2016-09-27 14:42:13 +0900 |
| commit | 32cd89a98e701ba1a8badd98b25a60ea409ca129 (patch) | |
| tree | 68dd4eec090182dfeba52dfe469bf69637660119 /tizen | |
| parent | 168fae707fb10068ea59795f3e4e49a59b2ef688 (diff) | |
| download | qemu-32cd89a98e701ba1a8badd98b25a60ea409ca129.tar.gz qemu-32cd89a98e701ba1a8badd98b25a60ea409ca129.tar.bz2 qemu-32cd89a98e701ba1a8badd98b25a60ea409ca129.zip | |
about: change version from build version to platform version
Change-Id: I4095209a97b751f51ce7c9696a98202399892493
Signed-off-by: jihye <jihye424.kim@samsung.com>
Diffstat (limited to 'tizen')
| -rw-r--r-- | tizen/src/ui/menu/aboutdialog.cpp | 7 | ||||
| -rw-r--r-- | tizen/src/ui/menu/detailedinfodialog.cpp | 3 | ||||
| -rw-r--r-- | tizen/src/ui/resource/ui_strings.h | 1 |
3 files changed, 8 insertions, 3 deletions
diff --git a/tizen/src/ui/menu/aboutdialog.cpp b/tizen/src/ui/menu/aboutdialog.cpp index 491eef6ed2..9b921554ba 100644 --- a/tizen/src/ui/menu/aboutdialog.cpp +++ b/tizen/src/ui/menu/aboutdialog.cpp @@ -30,6 +30,8 @@ #include "aboutdialog.h" #include "resource/ui_strings.h" #include "build_info.h" +#include "mainwindow.h" +#include "emul_state.h" AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent, Qt::Dialog | Qt::WindowStaysOnTopHint) @@ -56,6 +58,9 @@ AboutDialog::AboutDialog(QWidget *parent) : } upsideLayout->addWidget(imageLabel); + /* Emulator platform version*/ + QString platformVersion = QString(get_platform_version()).section('-', 1).trimmed(); + /* SDK version */ QString versionFilePath = QDir(QCoreApplication::applicationDirPath() + QDir::separator() + SDK_ROOT_PATH + SDK_VERSION_FILE).absolutePath(); @@ -90,7 +95,7 @@ AboutDialog::AboutDialog(QWidget *parent) : */ QString aboutText = - "<b>" + QString(EMULATOR_TITLE) + " for " + EMULATOR_BUILD_VER + "</b><p>" + + "<b>" + QString(EMULATOR_TITLE) + " for " + platformVersion + "</b><p>" + ABOUT_SDK_VERSION_TEXT + " : " + sdkVer + "<br>" + ABOUT_PKG_VERSION_TEXT + " : " + pkgVer + "<br>" + /* "Snapshot : " + SnapshotName + "<br>" + */ diff --git a/tizen/src/ui/menu/detailedinfodialog.cpp b/tizen/src/ui/menu/detailedinfodialog.cpp index 6bd9be74f1..cbf6640552 100644 --- a/tizen/src/ui/menu/detailedinfodialog.cpp +++ b/tizen/src/ui/menu/detailedinfodialog.cpp @@ -34,6 +34,7 @@ #include "resource/ui_strings.h" #include "mainwindow.h" #include "menu/advancedmenuitem.h" +#include "emul_state.h" extern "C" { int get_display_pixel_density(void); @@ -202,7 +203,7 @@ QTableWidget *DetailedInfoDialog::createVmInfoTable() } QString pkgVer = QString(pkginfo_version).section(':', 1).trimmed(); - insertTableRow(vmInfo, QString(DETAILED_INFO_EMUL_VER), QString(EMULATOR_BUILD_VER) + + insertTableRow(vmInfo, QString(DETAILED_INFO_EMUL_VER), QString(get_platform_version()).section('-', 1).trimmed() + " Release on " + sdkVer + " SDK (" + pkgVer + ")"); /* add double click event listener */ diff --git a/tizen/src/ui/resource/ui_strings.h b/tizen/src/ui/resource/ui_strings.h index 65566ffcf8..3a5c3afa5c 100644 --- a/tizen/src/ui/resource/ui_strings.h +++ b/tizen/src/ui/resource/ui_strings.h @@ -33,7 +33,6 @@ #define UI_STRINGS_H #define EMULATOR_TITLE "Tizen Emulator" -#define EMULATOR_BUILD_VER "3.0" #define SDK_OFFICIAL_NAME "Tizen SDK" #define SDK_OFFICIAL_URL "https://developer.tizen.org" |