From e70b7baf0a634b084fe469aaaacc1cc8aeedbf36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Thu, 31 Jan 2019 15:28:20 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@485 a8b55f48-bf90-11e4-a774-851b48703e85 --- make_android64.bat | 14 +++++++++++++- piqt_utils/piqt_iodevice_edit.cpp | 2 +- piqt_utils/piqt_iodevice_edit_dialog.cpp | 2 +- piqt_utils/piqt_iodevice_edit_dialog.h | 2 +- qad/graphic/graphic.cpp | 2 +- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/make_android64.bat b/make_android64.bat index 34f67a2..a98fd12 100644 --- a/make_android64.bat +++ b/make_android64.bat @@ -1,4 +1,16 @@ :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 -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 diff --git a/piqt_utils/piqt_iodevice_edit.cpp b/piqt_utils/piqt_iodevice_edit.cpp index 0fb094f..1eb8355 100644 --- a/piqt_utils/piqt_iodevice_edit.cpp +++ b/piqt_utils/piqt_iodevice_edit.cpp @@ -59,7 +59,7 @@ void IODeviceEdit::setReadOnly(bool yes) { void IODeviceEdit::buttonDlg_clicked() { - QAD::IODevice d = dlg->exec(dev); + QAD::IODevice d = dlg->getIODevice(dev); if (!d.isValid()) return; setDevice(d); } diff --git a/piqt_utils/piqt_iodevice_edit_dialog.cpp b/piqt_utils/piqt_iodevice_edit_dialog.cpp index 5380c1d..f7d3e4c 100644 --- a/piqt_utils/piqt_iodevice_edit_dialog.cpp +++ b/piqt_utils/piqt_iodevice_edit_dialog.cpp @@ -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); if (QDialog::exec() != QDialog::Accepted) return QAD::IODevice(); diff --git a/piqt_utils/piqt_iodevice_edit_dialog.h b/piqt_utils/piqt_iodevice_edit_dialog.h index 1f15a75..056826f 100644 --- a/piqt_utils/piqt_iodevice_edit_dialog.h +++ b/piqt_utils/piqt_iodevice_edit_dialog.h @@ -15,7 +15,7 @@ public: explicit IODeviceEditDialog(QWidget * parent = 0); ~IODeviceEditDialog(); - QAD::IODevice exec(const QAD::IODevice & d); + QAD::IODevice getIODevice(const QAD::IODevice & d); private: QAD::IODevice value() const; diff --git a/qad/graphic/graphic.cpp b/qad/graphic/graphic.cpp index 39bef03..61a3601 100644 --- a/qad/graphic/graphic.cpp +++ b/qad/graphic/graphic.cpp @@ -1108,7 +1108,7 @@ QPair Graphic::gridMark(double v) const { void Graphic::drawGraphics() { if (isHover) 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; sclx = (wid - gridborder.x() - margins_.left() - margins_.width()) / selrect.width(); scly = (hei - gridborder.y() - margins_.top() - margins_.height()) / selrect.height();