diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-09-05 18:46:57 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-09-05 18:46:57 +0200 |
| commit | 23d0bd8edde6aadfaa282215b5f143ad16210438 (patch) | |
| tree | a14d3f47b51716fb784cb426eedd0a2e2d756b4f /application | |
| parent | cd108fd02975eac3a3fed2fde26c58de5cbdaf1c (diff) | |
| download | MultiMC-23d0bd8edde6aadfaa282215b5f143ad16210438.tar MultiMC-23d0bd8edde6aadfaa282215b5f143ad16210438.tar.gz MultiMC-23d0bd8edde6aadfaa282215b5f143ad16210438.tar.lz MultiMC-23d0bd8edde6aadfaa282215b5f143ad16210438.tar.xz MultiMC-23d0bd8edde6aadfaa282215b5f143ad16210438.zip | |
NOISSUE make shared logic library ... shared
Diffstat (limited to 'application')
| -rw-r--r-- | application/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | application/MainWindow.cpp | 2 | ||||
| -rw-r--r-- | application/pages/OtherLogsPage.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt index 1ba19bc2..1cc37a5d 100644 --- a/application/CMakeLists.txt +++ b/application/CMakeLists.txt @@ -323,7 +323,7 @@ if(WIN32) set(MultiMC_LINK_ADDITIONAL_LIBS ${MultiMC_LINK_ADDITIONAL_LIBS} Qt5::WinMain) endif(WIN32) -include_directories(../logic) +include_directories(../logic ${CMAKE_CURRENT_BINARY_DIR}/../logic) # Qt 5 stuff qt5_wrap_ui(MULTIMC_UI ${MULTIMC_UIS}) diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp index 891842b5..b50d0160 100644 --- a/application/MainWindow.cpp +++ b/application/MainWindow.cpp @@ -1105,6 +1105,8 @@ void MainWindow::instanceFromZipPack(QString instName, QString instGroup, QStrin errorMsg += tr("Not an instance"); CustomMessageBox::selectable(this, tr("Error"), errorMsg, QMessageBox::Warning)->show(); return; + default: + break; } newInstance->setName(instName); diff --git a/application/pages/OtherLogsPage.h b/application/pages/OtherLogsPage.h index 9a5a6ed4..564b26d2 100644 --- a/application/pages/OtherLogsPage.h +++ b/application/pages/OtherLogsPage.h @@ -70,7 +70,7 @@ private: private: Ui::OtherLogsPage *ui; QString m_path; - RecursiveFileSystemWatcher *m_watcher; QString m_currentFile; IPathMatcher::Ptr m_fileFilter; + RecursiveFileSystemWatcher *m_watcher; }; |