Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
jacquetc committed Feb 14, 2023
2 parents 6f74ae3 + 6804793 commit 156a21e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions src/desktopapp/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@
#include "windowmanager.h"

#include "projectcommands.h"
#include "welcomedialog.h"
#include <QCloseEvent>
#include <QFileDialog>
#include <QMessageBox>
#include <QSettings>
#include <QTimer>
#include <WelcomeDialog.h>
#include <skrdata.h>

MainWindow::MainWindow(int newWindowId, bool restoreViewEnabled) : QMainWindow(), ui(new Ui::MainWindow)
Expand Down
2 changes: 1 addition & 1 deletion src/desktopapp/welcomedialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "skrdata.h"
#include "ui_welcomedialog.h"

#include <NewProjectWizard.h>
#include "newprojectwizard.h"
#include <QFileDialog>
#include <QFileInfo>
#include <QSettings>
Expand Down

0 comments on commit 156a21e

Please sign in to comment.