SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@485 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Бычков Андрей
2019-01-31 15:28:20 +00:00
parent b9c8f7c0a4
commit e70b7baf0a
5 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
make_android64.bat
View File

@@ -1,4 +1,16 @@
:please add to environment ANDROID_QT5_DIR (path to Qt directory) and ANDROID_NDK_HOME (path to android ndk directory) :please add to environment ANDROID_QT5_DIR (path to Qt directory) and ANDROID_NDK_HOME (path to android ndk directory)
:execute with Android API version e. g. : #make_android.bat 24 :execute with Android API version e. g. : #make_android.bat 24
cmake_mgw -Wno-dev -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_HOME%\build\cmake\android.toolchain.cmake -DANDROID_PLATFORM=android-%~1 -DANDROID_ABI=arm64-v8a -DICU=0 -DQt4=0 -DQt5=0 -DQGLVIEW=0 ..\libs set Qt5_ROOT=%ANDROID_QT5_DIR%\android_arm64_v8a\lib\cmake\
set Qt5_DIR=%Qt5_ROOT%\Qt5
set Qt5LinguistTools_DIR=%Qt5_ROOT%\Qt5LinguistTools
set Qt5UiPlugin_DIR=%Qt5_ROOT%\Qt5UiPlugin
set Qt5Widgets_DIR=%Qt5_ROOT%\Qt5Widgets
set Qt5Core_DIR=%Qt5_ROOT%\Qt5Core
set Qt5Gui_DIR=%Qt5_ROOT%\Qt5Gui
set Qt5Sql_DIR=%Qt5_ROOT%\Qt5Sql
set Qt5OpenGL_DIR=%Qt5_ROOT%\Qt5OpenGL
set Qt5Designer_DIR=%Qt5_ROOT%\Qt5Designer
set Qt5PrintSupport_DIR=%Qt5_ROOT%\Qt5PrintSupport
set Qt5Script_DIR=%Qt5_ROOT%\Qt5Script
cmake_mgw -Wno-dev -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_HOME%\build\cmake\android.toolchain.cmake -DANDROID_STL=c++_shared -DANDROID_PLATFORM=android-%~1 -DANDROID_ABI=arm64-v8a -DICU=0 -DQt4=0 -DQt5=1 -DQGLVIEW=0 -DQt5_DIR=%Qt5_ROOT%\Qt5 -DQt5LinguistTools_DIR=%Qt5_ROOT%\Qt5LinguistTools -DQt5UiPlugin_DIR=%Qt5_ROOT%\Qt5UiPlugin -DQt5Widgets_DIR=%Qt5_ROOT%\Qt5Widgets -DQt5Core_DIR=%Qt5_ROOT%\Qt5Core -DQt5Gui_DIR=%Qt5_ROOT%\Qt5Gui -DQt5Sql_DIR=%Qt5_ROOT%\Qt5Sql -DQt5OpenGL_DIR=%Qt5_ROOT%\Qt5OpenGL -DQt5PrintSupport_DIR=%Qt5_ROOT%\Qt5PrintSupport -DQt5Script_DIR=%Qt5_ROOT%\Qt5Script ..\libs

2
piqt_utils/piqt_iodevice_edit.cpp
View File

@@ -59,7 +59,7 @@ void IODeviceEdit::setReadOnly(bool yes) {
void IODeviceEdit::buttonDlg_clicked() { void IODeviceEdit::buttonDlg_clicked() {
QAD::IODevice d = dlg->exec(dev); QAD::IODevice d = dlg->getIODevice(dev);
if (!d.isValid()) return; if (!d.isValid()) return;
setDevice(d); setDevice(d);
} }

2
piqt_utils/piqt_iodevice_edit_dialog.cpp
View File

@@ -71,7 +71,7 @@ void IODeviceEditDialog::on_comboType_currentIndexChanged(int index) {
} }
QAD::IODevice IODeviceEditDialog::exec(const QAD::IODevice & d) { QAD::IODevice IODeviceEditDialog::getIODevice(const QAD::IODevice & d) {
setValue(d); setValue(d);
if (QDialog::exec() != QDialog::Accepted) if (QDialog::exec() != QDialog::Accepted)
return QAD::IODevice(); return QAD::IODevice();

2
piqt_utils/piqt_iodevice_edit_dialog.h
View File

@@ -15,7 +15,7 @@ public:
explicit IODeviceEditDialog(QWidget * parent = 0); explicit IODeviceEditDialog(QWidget * parent = 0);
~IODeviceEditDialog(); ~IODeviceEditDialog();
QAD::IODevice exec(const QAD::IODevice & d); QAD::IODevice getIODevice(const QAD::IODevice & d);
private: private:
QAD::IODevice value() const; QAD::IODevice value() const;

2
qad/graphic/graphic.cpp
View File

@@ -1108,7 +1108,7 @@ QPair<QString, QString> Graphic::gridMark(double v) const {
void Graphic::drawGraphics() { void Graphic::drawGraphics() {
if (isHover) if (isHover)
ui->status->setText(tr("Cursor: ") + pointCoords(canvas2real(QPointF(curpos)))); ui->status->setText(tr("Cursor: ") + pointCoords(canvas2real(QPointF(curpos))));
QPointF srp = -selrect.topLeft(), cp; QPointF srp = -selrect.topLeft();
double sclx, scly, wid = canvas->width(), hei = canvas->height() - legy; double sclx, scly, wid = canvas->width(), hei = canvas->height() - legy;
sclx = (wid - gridborder.x() - margins_.left() - margins_.width()) / selrect.width(); sclx = (wid - gridborder.x() - margins_.left() - margins_.width()) / selrect.width();
scly = (hei - gridborder.y() - margins_.top() - margins_.height()) / selrect.height(); scly = (hei - gridborder.y() - margins_.top() - margins_.height()) / selrect.height();