Merge pull request WizTeam#637 from WizTeam/2.8.8

2.8.8

.gitignore

@@ -5,3 +5,7 @@ CMakeLists.txt.user*
 !macos-package/.DS_Store
 *.autosave
 .idea/*
+
+*.user
+
+*.stash

CMakeLists.txt

@@ -17,7 +17,7 @@ else(APPLE)
 endif(APPLE)
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk")
+# set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk")
 
 # rpath resolve.
 #set(CMAKE_BUILD_WITH_INSTALL_RPATH YES)     // would cause wheelEvent problem on centos/fedora when compiled with qt5

WizNote.pro

@@ -0,0 +1,11 @@
+TEMPLATE = subdirs
+
+CONFIG += ordered
+
+SUBDIRS += \
+    lib/zlib \
+    lib/quazip \
+    lib/cryptopp \
+    src
+
+quazip.depends = zlib

build/common/logo/AppIcon.appiconset/Contents.json

@@ -0,0 +1,68 @@
+{
+  "images" : [
+    {
+      "size" : "16x16",
+      "idiom" : "mac",
+      "filename" : "1024-16.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "16x16",
+      "idiom" : "mac",
+      "filename" : "1024-32.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "32x32",
+      "idiom" : "mac",
+      "filename" : "1024-32.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "32x32",
+      "idiom" : "mac",
+      "filename" : "1024-64.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "128x128",
+      "idiom" : "mac",
+      "filename" : "1024-128.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "128x128",
+      "idiom" : "mac",
+      "filename" : "1024-256.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "256x256",
+      "idiom" : "mac",
+      "filename" : "1024-256.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "256x256",
+      "idiom" : "mac",
+      "filename" : "1024-512.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "512x512",
+      "idiom" : "mac",
+      "filename" : "1024-512.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "512x512",
+      "idiom" : "mac",
+      "filename" : "1024-1024.png",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

build/osx/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleShortVersionString</key>
-    <string>2.8.5</string>
+    <string>2.8.7</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.productivity</string>
 	<key>CFBundleName</key>
@@ -59,8 +59,6 @@
 			</array>
 		</dict>
 	</array>
-	<key>NSRequiresAquaSystemAppearance</key>
-	<false/>
 	<key>NSServices</key>
 	<array>
 		<dict>

cmake/QtChooser.cmake

@@ -40,10 +40,12 @@ macro(qt_add_resources)
 endmacro()
 
 macro(qt_use_modules)
+    find_package(Qt5 REQUIRED WebEngine WebEngineWidgets WebSockets WebChannel)
     if(APPLE)
-        qt5_use_modules(${ARGV0} Core Gui Widgets Xml Network PrintSupport WebEngine WebEngineWidgets WebSockets WebChannel MacExtras)
+        find_package(Qt5 REQUIRED MacExtras)
+        target_link_libraries(${ARGV0} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml Qt5::Network Qt5::PrintSupport Qt5::WebEngine Qt5::WebEngineWidgets Qt5::WebSockets Qt5::WebChannel Qt5::MacExtras)
     else(APPLE)
-        qt5_use_modules(${ARGV0} Core Gui Widgets Xml Network PrintSupport WebEngine WebEngineWidgets WebSockets WebChannel)
+        target_link_libraries(${ARGV0} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml Qt5::Network Qt5::PrintSupport Qt5::WebEngine Qt5::WebEngineWidgets Qt5::WebSockets Qt5::WebChannel)
     endif(APPLE)
 endmacro()