Skip to content

Commit 7d19421

Browse files
cristian-anitacristian-anita
committed
updated to v1.1.1
1 parent 1cdd2dc commit 7d19421

File tree

89 files changed

+1547
-445
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+1547
-445
lines changed

‎ChangeLog

+11-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Version 1.1.1.1:
2-
- Release date:
2+
- Release date: 10 Sep 2019
33
- New features:
44
- added MimeDatabase
55
- added openSUSE Leap 15.1
@@ -10,19 +10,23 @@ Version 1.1.1.1:
1010
- added CPPDEVTK_NO_INLINE and CPPDEVTK_FORCE_INLINE
1111
- removed IsMangled()
1212
- log to file
13+
- improved os ver checks
14+
- large file support checks
15+
- embed Qt translations only in static build
1316
- openSUSE Leap 15 bug #1094735 was fixed; removed workaround
1417
- openSUSE Tumbleweed: gcc 9.1.1 + boost 1.69.0 + Qt 5.13.0
15-
- iOS >= 8 (default 10)
16-
- Android >= 2.3 (API level 9) (default 4.4.2 (API level 19))
18+
- iOS >= 9 (default 10)
19+
- Android >= 4.0.3 (API level 15) (default 4.4.2 (API level 19))
1720
- updated JNI_VERSION: 1.6 on Android and Mac OS X < 10.7, 1.8 on remaining platforms
18-
- updated Qt to 5.12.3 on Ubuntu 16.04
19-
- updated Qt to 5.9.7 on Ubuntu 14.04
20-
- updated Qt to 5.9.8 on iOS
21-
- updated Ubuntu to 18.04.2, 16.04.6 and 14.04.6
21+
- updated Qt to 5.9.7 on Ubuntu 16.04 and 14.04
22+
- updated Qt to 5.9.8 on Win, Mac and iOS
23+
- updated Ubuntu to 18.04.3, 16.04.6 and 14.04.6
2224
- updated CentOS 7 to 7.6
25+
- updated third party libs; modified for new third party dir structure on Win and Mac
2326
- Fixed bugs:
2427
- executor: workaround for Qt bug #6799
2528
- executor: if Qt < 5.6.2 then may be affected by Qt bug #54831
29+
- custom wizard back()
2630

2731

2832
Version 1.1.0.1:

‎INSTALL

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
1. Prerequisites:
22
- Qt 5.6.3 msvc2015 and Qt 5.6.1-1 android needed on Windows
3-
- Qt 5.6.3 macosx and Qt 5.9.7 ios needed on Mac OS X
3+
- Qt 5.6.3 macosx and Qt 5.9.8 ios needed on Mac OS X
44
- JDK 8u144 needed on Windows
55
- JDK 8u144 needed on Mac OS X >= 10.7 and Apple provided JDK 6 on Mac < 10.7
66
- Android SDK r25.2.5 + NDK r10e needed on Windows
77

88

99
Qt 5:
1010
- Ubuntu 16.04 (ppa:beineri, https://launchpad.net/~beineri):
11-
> sudo add-apt-repository ppa:beineri/opt-qt-5.12.3-xenial
11+
> sudo add-apt-repository ppa:beineri/opt-qt597-xenial
1212
> sudo apt-get update
13-
> sudo apt-get install qt512-meta-full qt512base qt512x11extras
13+
> sudo apt-get install qt59-meta-full qt-latest qt59base qt59x11extras
1414
- Ubuntu 14.04 (ppa:beineri, https://launchpad.net/~beineri):
1515
> sudo apt-add-repository ppa:beineri/opt-qt597-trusty
1616
> sudo apt-get update
@@ -23,6 +23,11 @@ Qt 5:
2323
> sudo apt-get install build-essential ubuntu-dev-tools debhelper dpkg-sig apt-file
2424

2525

26+
- Ubuntu 14.04 openjdk 8:
27+
> sudo add-apt-repository ppa:openjdk-r/ppa
28+
> sudo apt-get update
29+
> sudo apt-get install openjdk-8-jdk
30+
2631
- Windows environment variables for Java and Android:
2732
JAVA_HOME C:\Program Files\Java\jdk1.8.0_144
2833
ANDROID_NDK_ROOT C:\android\ndk-r10e

‎common.pri

+47-18
Original file line numberDiff line numberDiff line change
@@ -489,10 +489,6 @@ unix {
489489
}
490490
else {
491491
macx {
492-
DEFINES += MAC_OS_X_VERSION_MIN_REQUIRED=$${CPPDEVTK_MAC_OS_X_VERSION_MIN_REQUIRED}
493-
DEFINES += __MAC_OS_X_VERSION_MIN_REQUIRED=$${CPPDEVTK_MAC_OS_X_VERSION_MIN_REQUIRED}
494-
DEFINES += MAC_OS_X_VERSION_MAX_ALLOWED=$${CPPDEVTK_MAC_OS_X_VERSION_MAX_ALLOWED}
495-
DEFINES += __MAC_OS_X_VERSION_MAX_ALLOWED=$${CPPDEVTK_MAC_OS_X_VERSION_MAX_ALLOWED}
496492
QMAKE_MACOSX_DEPLOYMENT_TARGET = $${CPPDEVTK_MACOSX_DEPLOYMENT_TARGET}
497493
QMAKE_CFLAGS *= -mmacosx-version-min=$${CPPDEVTK_MACOSX_DEPLOYMENT_TARGET}
498494
QMAKE_CXXFLAGS *= -mmacosx-version-min=$${CPPDEVTK_MACOSX_DEPLOYMENT_TARGET}
@@ -506,8 +502,6 @@ unix {
506502
error("both iphonesimulator and iphoneos are missing from CONFIG")
507503
}
508504

509-
DEFINES += __IPHONE_OS_VERSION_MIN_REQUIRED=$${CPPDEVTK_IPHONE_OS_VERSION_MIN_REQUIRED}
510-
DEFINES += __IPHONE_OS_VERSION_MAX_ALLOWED=$${CPPDEVTK_IPHONE_OS_VERSION_MAX_ALLOWED}
511505
QMAKE_IOS_DEPLOYMENT_TARGET = $${CPPDEVTK_IOS_DEPLOYMENT_TARGET}
512506
CONFIG(iphonesimulator, iphonesimulator|iphoneos) {
513507
QMAKE_CFLAGS *= -mios-simulator-version-min=$${CPPDEVTK_IOS_DEPLOYMENT_TARGET}
@@ -531,10 +525,8 @@ unix {
531525
}
532526
else {
533527
win32 {
534-
DEFINES += _WIN32_WINNT=$${CPPDEVTK_WIN32_WINNT}
535-
DEFINES += NTDDI_VERSION=$${CPPDEVTK_NTDDI_VERSION}
536-
DEFINES += WINVER=$${CPPDEVTK_WINVER}
537-
DEFINES += _WIN32_IE=$${CPPDEVTK_WIN32_IE}
528+
#DEFINES *= _WIN32_WINNT=$${CPPDEVTK_WIN32_WINNT}
529+
#DEFINES *= NTDDI_VERSION=$${CPPDEVTK_NTDDI_VERSION}
538530
}
539531
else {
540532
error("Unsupported platform!!!")
@@ -838,7 +830,27 @@ else {
838830
}
839831
else {
840832
macx {
841-
DESTDIR = $${DESTDIR}/macosx
833+
*g++* {
834+
cppdevtk_disable_old_os {
835+
DESTDIR = $${DESTDIR}/mac105
836+
}
837+
else {
838+
DESTDIR = $${DESTDIR}/mac104
839+
}
840+
}
841+
else {
842+
*clang* {
843+
cppdevtk_disable_old_os {
844+
DESTDIR = $${DESTDIR}/mac1010
845+
}
846+
else {
847+
DESTDIR = $${DESTDIR}/mac107
848+
}
849+
}
850+
else {
851+
error("Unsupported compiler for Mac OS X platform!!!")
852+
}
853+
}
842854
}
843855
else {
844856
ios {
@@ -882,6 +894,9 @@ else {
882894
isEmpty(CPPDEVTK_COMPILER) {
883895
error("CPPDEVTK_COMPILER is empty")
884896
}
897+
isEqual(CPPDEVTK_COMPILER, "msvc") {
898+
CPPDEVTK_COMPILER = msvc2015
899+
}
885900
DESTDIR = $${DESTDIR}/$${CPPDEVTK_COMPILER}
886901
}
887902
}
@@ -901,13 +916,25 @@ else {
901916
}
902917
else {
903918
macx {
904-
# QT_ARCH does not work in Qt 4 on mac; fortunatelly we use Qt 4 only on 32 bits.
905919
greaterThan(QT_MAJOR_VERSION, 4) {
906920
isEmpty(QT_ARCH) {
907921
error("QT_ARCH is empty!!!")
908922
}
909923
DESTDIR = $${DESTDIR}/$${QT_ARCH}
910924
}
925+
else {
926+
x86 {
927+
DESTDIR = $${DESTDIR}/x86
928+
}
929+
else {
930+
x86_64 {
931+
DESTDIR = $${DESTDIR}/x86_64
932+
}
933+
else {
934+
error("arch missing from CONFIG!!!")
935+
}
936+
}
937+
}
911938
}
912939
else {
913940
ios {
@@ -1325,12 +1352,12 @@ unix {
13251352
}
13261353

13271354
macx {
1328-
!contains(QT_CONFIG, rpath) {
1329-
error("Please build Qt with rpath!!!")
1330-
}
1331-
13321355
# @rpath was introduced in 10.5
13331356
greaterThan(CPPDEVTK_MAC_OS_X_VERSION_MIN_REQUIRED, 1040) {
1357+
!contains(QT_CONFIG, rpath) {
1358+
error("Please build Qt with rpath!!!")
1359+
}
1360+
13341361
QMAKE_SONAME_PREFIX = @rpath
13351362
CONFIG -= absolute_library_soname
13361363
}
@@ -1351,10 +1378,12 @@ win32 {
13511378

13521379
QMAKE_RC += -d _WIN32_WINNT=$${CPPDEVTK_WIN32_WINNT}
13531380
QMAKE_RC += -d NTDDI_VERSION=$${CPPDEVTK_NTDDI_VERSION}
1354-
QMAKE_RC += -d WINVER=$${CPPDEVTK_WINVER}
1355-
QMAKE_RC += -d _WIN32_IE=$${CPPDEVTK_WIN32_IE}
13561381

13571382
QMAKE_RC += -d _WIN32 -d WIN32
1383+
isEqual(QMAKE_TARGET.arch, "x86_64") {
1384+
QMAKE_RC += -d _WIN64 -d WIN64
1385+
}
1386+
13581387
QMAKE_RC += -d _UNICODE -d UNICODE
13591388

13601389
!static_and_shared|build_pass {

‎common_customization.pri

+62-46
Original file line numberDiff line numberDiff line change
@@ -24,48 +24,70 @@ CONFIG += cppdevtk_enable_debuginfo_in_release
2424
#CONFIG += cppdevtk_enable_target_suffix_qt_major_version
2525
CONFIG += cppdevtk_enable_app_target_debug_suffix
2626
CONFIG += cppdevtk_disable_warnings
27+
2728
# TODO: keep in sync with CPPDEVTK_WITH_ZLIB in config/features.hpp
2829
CONFIG += cppdevtk_with_zlib
30+
2931
win32 {
30-
CONFIG += cppdevtk_target_xp
32+
#CONFIG += cppdevtk_target_xp
3133
}
32-
34+
# TODO: keep in sync with CPPDEVTK_DISABLE_OLD_OS in config/features.hpp
35+
CONFIG += cppdevtk_disable_old_os
3336

3437
# TODO: keep in sync with CPPDEVTK_ENABLE_QT_SOLUTIONS in config/features.hpp
3538
CPPDEVTK_ENABLE_QTSOLUTIONS = true
3639

3740

3841
# target OS version
39-
# TODO: keep in sync with features.hpp
42+
# TODO: keep in sync with config/features.hpp
4043
unix {
4144
linux* {
4245
android {
4346
# ignored by Qt Creator and qmake; must be set as environment variable
44-
#ANDROID_NDK_PLATFORM = android-21
47+
cppdevtk_disable_old_os {
48+
#ANDROID_NDK_PLATFORM = android-21
49+
}
50+
else {
51+
#ANDROID_NDK_PLATFORM = android-19
52+
}
4553
}
4654
}
4755
else {
4856
macx {
4957
*g++* {
50-
CPPDEVTK_MAC_OS_X_VERSION_MIN_REQUIRED = 1050
51-
CPPDEVTK_MACOSX_DEPLOYMENT_TARGET = 10.5
58+
cppdevtk_disable_old_os {
59+
CPPDEVTK_MAC_OS_X_VERSION_MIN_REQUIRED = 1050
60+
CPPDEVTK_MACOSX_DEPLOYMENT_TARGET = 10.5
61+
}
62+
else {
63+
CPPDEVTK_MAC_OS_X_VERSION_MIN_REQUIRED = 1040
64+
CPPDEVTK_MACOSX_DEPLOYMENT_TARGET = 10.4
65+
}
5266
}
5367
else {
5468
*clang* {
55-
CPPDEVTK_MAC_OS_X_VERSION_MIN_REQUIRED = 101100
56-
CPPDEVTK_MACOSX_DEPLOYMENT_TARGET = 10.11
69+
cppdevtk_disable_old_os {
70+
CPPDEVTK_MAC_OS_X_VERSION_MIN_REQUIRED = 101000
71+
CPPDEVTK_MACOSX_DEPLOYMENT_TARGET = 10.10
72+
}
73+
else {
74+
CPPDEVTK_MAC_OS_X_VERSION_MIN_REQUIRED = 1070
75+
CPPDEVTK_MACOSX_DEPLOYMENT_TARGET = 10.7
76+
}
5777
}
5878
else {
5979
error("Unsupported compiler for Mac OS X platform!!!")
6080
}
6181
}
62-
CPPDEVTK_MAC_OS_X_VERSION_MAX_ALLOWED = $${CPPDEVTK_MAC_OS_X_VERSION_MIN_REQUIRED}
6382
}
6483
else {
6584
ios {
66-
CPPDEVTK_IPHONE_OS_VERSION_MIN_REQUIRED = 100000
67-
CPPDEVTK_IPHONE_OS_VERSION_MAX_ALLOWED = $${CPPDEVTK_IPHONE_OS_VERSION_MIN_REQUIRED}
68-
CPPDEVTK_IOS_DEPLOYMENT_TARGET = 10.0
85+
cppdevtk_disable_old_os {
86+
CPPDEVTK_IOS_DEPLOYMENT_TARGET = 10.0
87+
}
88+
else {
89+
CPPDEVTK_IOS_DEPLOYMENT_TARGET = 9.0
90+
}
6991
}
7092
else {
7193
error("Unsupported Unix platform!!!")
@@ -75,19 +97,29 @@ unix {
7597
}
7698
else {
7799
win32 {
78-
cppdevtk_target_xp {
79-
# Win XP SP3
80-
CPPDEVTK_WIN32_WINNT = 0x0501
81-
CPPDEVTK_NTDDI_VERSION = 0x05010300
82-
CPPDEVTK_WINVER = $${CPPDEVTK_WIN32_WINNT}
83-
CPPDEVTK_WIN32_IE = 0x0603
100+
cppdevtk_disable_old_os {
101+
cppdevtk_target_xp {
102+
# Win Vista SP2
103+
CPPDEVTK_WIN32_WINNT = 0x0600
104+
CPPDEVTK_NTDDI_VERSION = 0x06000200
105+
}
106+
else {
107+
# Win 7
108+
CPPDEVTK_WIN32_WINNT = 0x0601
109+
CPPDEVTK_NTDDI_VERSION = 0x06010000
110+
}
84111
}
85112
else {
86-
# Win 7
87-
CPPDEVTK_WIN32_WINNT = 0x0601
88-
CPPDEVTK_NTDDI_VERSION = 0x06010000
89-
CPPDEVTK_WINVER = $${CPPDEVTK_WIN32_WINNT}
90-
CPPDEVTK_WIN32_IE = 0x0800
113+
cppdevtk_target_xp {
114+
# Win XP SP3
115+
CPPDEVTK_WIN32_WINNT = 0x0501
116+
CPPDEVTK_NTDDI_VERSION = 0x05010300
117+
}
118+
else {
119+
# Win Vista SP2
120+
CPPDEVTK_WIN32_WINNT = 0x0600
121+
CPPDEVTK_NTDDI_VERSION = 0x06000200
122+
}
91123
}
92124
}
93125
else {
@@ -169,9 +201,9 @@ else {
169201

170202
# CPPDEVTK_PREFIX
171203
# Ex:
172-
# linux: /usr/local/(static)
204+
# linux: /usr/local
173205
# android: C:/local-android/arch (/usr/local-android/arch)
174-
# mac: /usr/local/arch/(static)
206+
# mac: /usr/local
175207
# iphonesimulator: /usr/local-ios/iphonesimulator
176208
# iphoneos: /usr/local-ios/iphoneos
177209
# windows: C:/local/qtver/compiler/arch/(static)
@@ -237,6 +269,9 @@ isEmpty(CPPDEVTK_PREFIX) {
237269
isEmpty(CPPDEVTK_COMPILER) {
238270
error("CPPDEVTK_COMPILER is empty")
239271
}
272+
isEqual(CPPDEVTK_COMPILER, "msvc") {
273+
CPPDEVTK_COMPILER = msvc2015
274+
}
240275
CPPDEVTK_PREFIX = $${CPPDEVTK_PREFIX}/$${CPPDEVTK_COMPILER}
241276
}
242277
}
@@ -256,26 +291,7 @@ isEmpty(CPPDEVTK_PREFIX) {
256291
}
257292
else {
258293
macx {
259-
# QT_ARCH does not work in Qt 4 on mac.
260-
greaterThan(QT_MAJOR_VERSION, 4) {
261-
isEmpty(QT_ARCH) {
262-
error("QT_ARCH is empty!!!")
263-
}
264-
CPPDEVTK_PREFIX = $${CPPDEVTK_PREFIX}/$${QT_ARCH}
265-
}
266-
else {
267-
x86 {
268-
CPPDEVTK_PREFIX = $${CPPDEVTK_PREFIX}/x86
269-
}
270-
else {
271-
x86_64 {
272-
CPPDEVTK_PREFIX = $${CPPDEVTK_PREFIX}/x86_64
273-
}
274-
else {
275-
error("arch missing from CONFIG!!!")
276-
}
277-
}
278-
}
294+
# arch not used
279295
}
280296
else {
281297
ios {
@@ -301,7 +317,7 @@ isEmpty(CPPDEVTK_PREFIX) {
301317
}
302318

303319
# link
304-
!android:!ios {
320+
!android:!ios:!linux*:!macx {
305321
!static_and_shared|build_pass {
306322
CONFIG(static, static|shared) {
307323
CPPDEVTK_PREFIX = $${CPPDEVTK_PREFIX}/static

0 commit comments

Comments
 (0)