Skip to content

Commit

Permalink
Fix version, add ssl for windows
Browse files Browse the repository at this point in the history
  • Loading branch information
azagaya committed Feb 5, 2021
1 parent 61f6f26 commit cfce581
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions laigter.pro
Original file line number Diff line number Diff line change
Expand Up @@ -195,3 +195,4 @@ RESOURCES += \

win32: RC_ICONS = icons\laigter_icon.ico
mac: ICON = icons/laigter_icon.icns

2 changes: 1 addition & 1 deletion main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ QCoreApplication *createApplication(int &argc, char *argv[])
int main(int argc, char *argv[])
{
QCoreApplication::setApplicationName("laigter");
QCoreApplication::setApplicationVersion("1.10.2-beta");
QCoreApplication::setApplicationVersion("1.10.3-beta");
//QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts);

Expand Down
4 changes: 2 additions & 2 deletions main_window.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,6 @@ void MainWindow::list_menu_action_triggered(QAction *action)
if (index > 0)
{
ImageProcessor *p2 = processorList.at(index - 1);
qDebug() << processorList;
QImage h = p->get_heightmap();
QImage h2 = p2->get_heightmap();

Expand All @@ -360,7 +359,6 @@ void MainWindow::list_menu_action_triggered(QAction *action)
QPoint point2 = p2->get_position()->toPoint();
QPoint point1 = p->get_position()->toPoint();
QPoint position = QPoint(point2.x(), -point2.y()) - QPoint(h2.width(), h2.height()) / 2 - (QPoint(point1.x(), -point1.y()) - QPoint(h.width(), h.height()) / 2);
qDebug() << position;
painter.drawImage(position, h2);

p->get_current_frame()->set_image(TextureTypes::Heightmap, h);
Expand Down Expand Up @@ -1540,6 +1538,8 @@ void MainWindow::on_actionLoadPlugins_triggered()
}
QFile(dir.absoluteFilePath(fileName)).copy(tmp.absoluteFilePath(fileName));
QPluginLoader *pl = new QPluginLoader(tmp.absoluteFilePath(fileName));
qDebug() << pl->metaData().value("MetaData").toObject().value("version").toDouble();
qDebug() << pl->metaData().value("MetaData").toObject().value("name").toString();
if (pl->metaData().value("MetaData").toObject().value("version").toDouble() < 1.103)
{
qDebug() << "incorrect plugin version.";
Expand Down

0 comments on commit cfce581

Please sign in to comment.