- updated copyright year

- enabled hidpi
- SetStyleSheetFromFileCross(): added support for Android and iOS

Author: cristian-anita

ChangeLog

@@ -1,3 +1,13 @@
+Version 1.1.2.1:
+- Release date:
+- New features:
+	- added CentOS 8
+- Improvements:
+	- SetStyleSheetFromFileCross(): added support for Android and iOS
+	- updated CentOS 7 to 7.7
+- Fixed bugs:
+
+
 Version 1.1.1.1:
 - Release date: 10 Sep 2019
 - New features:

Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = CppDevTk
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.1.1
+PROJECT_NUMBER         = 1.1.2
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

INSTALL

@@ -1,6 +1,6 @@
 1. Prerequisites:
-- Qt 5.6.3 msvc2015 and Qt 5.6.1-1 android needed on Windows
-- Qt 5.6.3 macosx and Qt 5.9.8 ios needed on Mac OS X
+- Qt 5.9.8 msvc2015 and Qt 5.6.1-1 android needed on Windows
+- Qt 5.9.8 needed on Mac OS X and iOS
 - JDK 8u144 needed on Windows
 - JDK 8u144 needed on Mac OS X >= 10.7 and Apple provided JDK 6 on Mac < 10.7
 - Android SDK r25.2.5 + NDK r10e needed on Windows

common.pri

@@ -1,5 +1,5 @@
 #****************************************************************************************************************************
-# Copyright (C) 2015 - 2019 CoSoSys Ltd <[email protected]>
+# Copyright (C) 2015 - 2020 CoSoSys Ltd <[email protected]>
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -58,7 +58,7 @@ else {
 # version
 CPPDEVTK_VERSION_MAJOR = 1
 CPPDEVTK_VERSION_MINOR = 1
-CPPDEVTK_VERSION_PATCH = 1
+CPPDEVTK_VERSION_PATCH = 2
 win32 {
 	CPPDEVTK_VERSION_BUILD = 1
 }
@@ -1382,6 +1382,10 @@ win32 {
 	QMAKE_RC += -d _WIN32 -d WIN32
 	isEqual(QMAKE_TARGET.arch, "x86_64") {
 		QMAKE_RC += -d _WIN64 -d WIN64
+		QMAKE_RC += -d _M_X64 -d _M_AMD64
+	}
+	else {
+		QMAKE_RC += -d _M_IX86
 	}
 
 	QMAKE_RC += -d _UNICODE -d UNICODE
@@ -1403,6 +1407,7 @@ win32 {
 
 	QMAKE_RC += -I $${PWD}/include
 	QMAKE_RC += -I $${CPPDEVTK_THIRD_PARTY_INCLUDE_DIR}
+	QMAKE_RC += -I $$[QT_INSTALL_HEADERS]
 }
 
 

common_customization.pri

@@ -1,5 +1,5 @@
 #****************************************************************************************************************************
-# Copyright (C) 2015 - 2019 CoSoSys Ltd <[email protected]>
+# Copyright (C) 2015 - 2020 CoSoSys Ltd <[email protected]>
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

cppdevtk.pro

@@ -1,5 +1,5 @@
 #****************************************************************************************************************************
-# Copyright (C) 2015 - 2019 CoSoSys Ltd <[email protected]>
+# Copyright (C) 2015 - 2020 CoSoSys Ltd <[email protected]>
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at