Merge branch 'dev' of http://192.168.10.5:8099/sane/code_app into dev
This commit is contained in:
commit
069407b74c
|
@ -3288,7 +3288,10 @@ void MainWindow::on_act_about_triggered()
|
|||
#if defined (OEM_DELI)
|
||||
content += tr("<p>After-sale telephone: %1</p>").arg(QString::fromLocal8Bit(BRAND_COMPANY_TEL));
|
||||
#else
|
||||
content += tr("<p>Company telephone: %1</p>").arg(QString::fromLocal8Bit(BRAND_COMPANY_TEL));
|
||||
#if !defined(OEM_ZHONGJING)
|
||||
content += tr("<p>Company telephone: %1</p>").arg(QString::fromLocal8Bit(BRAND_COMPANY_TEL));
|
||||
#endif
|
||||
|
||||
content += tr("<p>Company GPS: <a href=\"%1\">%2</a></p>").arg(QString::fromLocal8Bit(BRAND_URL_GPS)).arg(tr("Baidu map access"));
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in New Issue