games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-18 17:40:48 +02:00
Code Issues Releases Activity

Merge branch 'cpp-map-editor' into EraseAction

Browse Source
This commit is contained in:
Nordsoft91 2022-09-06 20:18:19 +04:00 committed by GitHub
commit 684fa5c96c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/github.yml vendored
View File

@ -5,6 +5,7 @@ on:
branches: branches:
- features/* - features/*
- develop - develop
- cpp-map-editor
pull_request: pull_request:
env: env:
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
@ -46,7 +47,7 @@ jobs:
pack: 1 pack: 1
cpack_args: -D CPACK_NSIS_EXECUTABLE=`which makensis` cpack_args: -D CPACK_NSIS_EXECUTABLE=`which makensis`
extension: exe extension: exe
cmake_args: -G Ninja cmake_args: -G Ninja -DENABLE_EDITOR=0
- platform: msvc - platform: msvc
os: windows-latest os: windows-latest
test: 0 test: 0

2
.travis.yml
View File

@ -41,7 +41,7 @@ addons:
notification_email: coverity@arseniyshestakov.com notification_email: coverity@arseniyshestakov.com
build_command_prepend: cov-configure --compiler clang-3.6 --comptype clangcc && build_command_prepend: cov-configure --compiler clang-3.6 --comptype clangcc &&
cov-configure --comptype clangcxx --compiler clang++-3.6 && cmake -G Ninja .. cov-configure --comptype clangcxx --compiler clang++-3.6 && cmake -G Ninja ..
-DCMAKE_BUILD_TYPE=DEBUG -DENABLE_LAUNCHER=0 -DCMAKE_BUILD_TYPE=DEBUG -DENABLE_LAUNCHER=0 -DENABLE_EDITOR=0
build_command: ninja -j 3 build_command: ninja -j 3
branch_pattern: coverity_scan branch_pattern: coverity_scan

1
mapeditor/mainwindow.cpp
View File

@ -2,7 +2,6 @@
#include "mainwindow.h" #include "mainwindow.h"
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
#include <QApplication.h>
#include <QFileDialog> #include <QFileDialog>
#include <QFile> #include <QFile>
#include <QMessageBox> #include <QMessageBox>

2
mapeditor/spoiler.cpp
View File

@ -1,7 +1,7 @@
#include "StdInc.h" #include "StdInc.h"
#include <QPropertyAnimation> #include <QPropertyAnimation>
#include "Spoiler.h" #include "spoiler.h"
Spoiler::Spoiler(const QString & title, const int animationDuration, QWidget *parent) : QWidget(parent), animationDuration(animationDuration) Spoiler::Spoiler(const QString & title, const int animationDuration, QWidget *parent) : QWidget(parent), animationDuration(animationDuration)
{ {