diff options
| author | LePresidente <brian.alexander.munro@gmail.com> | 2017-10-22 21:05:06 +0200 |
|---|---|---|
| committer | LePresidente <brian.alexander.munro@gmail.com> | 2017-10-22 21:05:06 +0200 |
| commit | b09f8ce7b40a64fa6ac6cdf2dd1a8acdfb736204 (patch) | |
| tree | 72f2081a9360ac36876c2757e85c5b17f8314e4c /src | |
| parent | 2d4b46333858b25bd70f7d7f045cedc3ab7ada4f (diff) | |
Updated version to 2.1.0beta
Added QtQuick to cmake to try address tutorial issue [Untested]
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/version.rc | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 448f47e5..833f7504 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -234,6 +234,7 @@ SET(CMAKE_AUTOMOC ON) SET(CMAKE_AUTOUIC ON) FIND_PACKAGE(Qt5Widgets REQUIRED) FIND_PACKAGE(Qt5QuickWidgets REQUIRED) +FIND_PACKAGE(Qt5Quick REQUIRED) FIND_PACKAGE(Qt5Network REQUIRED) FIND_PACKAGE(Qt5WinExtras REQUIRED) FIND_PACKAGE(Qt5WebEngineWidgets REQUIRED) @@ -299,7 +300,7 @@ ENDIF() ADD_EXECUTABLE(ModOrganizer WIN32 ${organizer_HDRS} ${organizer_SRCS} ${organizer_UIHDRS} ${organizer_RCS} ${organizer_RCCPPS} ${organizer_translations_qm}) TARGET_LINK_LIBRARIES(ModOrganizer - Qt5::Widgets Qt5::WinExtras Qt5::WebEngineWidgets + Qt5::Widgets Qt5::WinExtras Qt5::WebEngineWidgets Qt5::Quick ${Boost_LIBRARIES} zlibstatic uibase esptk bsatk githubpp @@ -313,7 +314,7 @@ SET_TARGET_PROPERTIES(ModOrganizer PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/LARGEADDRESSAWARE ${OPTIMIZE_LINK_FLAGS}") -QT5_USE_MODULES(ModOrganizer Widgets Script Qml QuickWidgets Network WebEngineWidgets) +QT5_USE_MODULES(ModOrganizer Widgets Script Qml QuickWidgets Quick Network WebEngineWidgets) ############### diff --git a/src/version.rc b/src/version.rc index e3a2c832..f8b62a2f 100644 --- a/src/version.rc +++ b/src/version.rc @@ -1,7 +1,7 @@ #include "Winver.h"
-#define VER_FILEVERSION 2,0,8,3
-#define VER_FILEVERSION_STR "2.0.8.3beta\0"
+#define VER_FILEVERSION 2,1,0
+#define VER_FILEVERSION_STR "2.1.0beta\0"
VS_VERSION_INFO VERSIONINFO
FILEVERSION VER_FILEVERSION
|