Skip to content

Commit b94a2ed

Browse files
cristian-anitacristian-anita
committed
static qt related
1 parent bca2168 commit b94a2ed

Some content is hidden

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

59 files changed

+99
-43
lines changed

‎ChangeLog

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
Version 1.0.7.1:
1+
Version 1.0.7.1: 18 Jan 2018
22
- Release date:
33
- New features:
44
- Improvements:
5+
- qt 4 and qt 5: fixed support for qt static builds, static qico plugin, translations
56
- Fixed bugs:
67

78

‎INSTALL

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,5 +97,13 @@ make
9797
make -j1 install
9898

9999
6.3 On Linux if packaging:
100-
RPM: rpmbuild -ta cppdevtk-1.0.0.tar.bz2
100+
RPM: rpmbuild -ta --sign cppdevtk-1.0.0.tar.bz2
101101
Deb: debuild --no-tgz-check -D -us -uc -B
102+
103+
Verify signature:
104+
- rpm based
105+
> rpm --checksig ./*.rpm
106+
107+
- deb based
108+
Ubuntu 16.04: dpkg-sig --verify ./*.deb
109+
Ubuntu 14.04: dpkg-sig-fixed --verify ./*.deb

‎common_customization.pri

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ isEmpty(CPPDEVTK_PREFIX) {
264264
!android:!ios {
265265
!static_and_shared|build_pass {
266266
CONFIG(static, static|shared) {
267-
DESTDIR = $${DESTDIR}/static
267+
CPPDEVTK_PREFIX = $${CPPDEVTK_PREFIX}/static
268268
}
269269
}
270270
}

‎cppdevtk.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -591,9 +591,9 @@ exit 0
591591

592592

593593
%changelog
594-
* Mon Jan 8 2018 Cristian ANITA <[email protected]>, <[email protected]>
594+
* Thu Jan 18 2018 Cristian ANITA <[email protected]>, <[email protected]>
595595
- v1.0.7.1
596-
- to fill
596+
- qt 4 and qt 5: fixed support for qt static builds, static qico plugin, translations
597597
* Sun Jan 7 2018 Cristian ANITA <[email protected]>, <[email protected]>
598598
- v1.0.6.1
599599
- added CallTraits

‎customizations/cososys/common_customization.pri

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ isEmpty(CPPDEVTK_PREFIX) {
265265
!android:!ios {
266266
!static_and_shared|build_pass {
267267
CONFIG(static, static|shared) {
268-
DESTDIR = $${DESTDIR}/static
268+
CPPDEVTK_PREFIX = $${CPPDEVTK_PREFIX}/static
269269
}
270270
}
271271
}

‎customizations/cososys/include/cppdevtk/config/features.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,6 @@
247247
#endif
248248

249249

250-
#define CPPDEVTK_ENABLE_STATIC_PLUGIN_WORKAROUND (CPPDEVTK_PLATFORM_IOS && 1)
251-
252250
#if (defined(__unix__) || defined(__unix))
253251
# define CPPDEVTK_DISABLE_UNICODE 0
254252
# define CPPDEVTK_DISABLE_WIDE 1

‎debian/changelog

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
cppdevtk (1.0.7-0ubuntu1) xenial; urgency=medium
22

3-
* to fill
3+
* qt 4 and qt 5: fixed support for qt static builds, static qico plugin, translations
44

5-
-- Cristian ANITA <[email protected]>, <[email protected]> Mon, 8 Jan 2018 14:19:46 +0300
5+
-- Cristian ANITA <[email protected]>, <[email protected]> Thu, 18 Jan 2018 14:19:46 +0300
66

77

88
cppdevtk (1.0.6-0ubuntu1) xenial; urgency=medium

‎debian_distros/ubuntu_14.04/debian/changelog

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
cppdevtk (1.0.7-0ubuntu1) trusty; urgency=medium
22

3-
* to fill
3+
* qt 4 and qt 5: fixed support for qt static builds, static qico plugin, translations
44

5-
-- Cristian ANITA <[email protected]>, <[email protected]> Mon, 8 Jan 2018 14:19:46 +0300
5+
-- Cristian ANITA <[email protected]>, <[email protected]> Thu, 18 Jan 2018 14:19:46 +0300
66

77

88
cppdevtk (1.0.6-0ubuntu1) trusty; urgency=medium

‎doc/cppdevtk_api.chm

-166 Bytes
Binary file not shown.

‎include/cppdevtk/config/features.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,6 @@
247247
#endif
248248

249249

250-
#define CPPDEVTK_ENABLE_STATIC_PLUGIN_WORKAROUND (CPPDEVTK_PLATFORM_IOS && 1)
251-
252250
#if (defined(__unix__) || defined(__unix))
253251
# define CPPDEVTK_DISABLE_UNICODE 0
254252
# define CPPDEVTK_DISABLE_WIDE 1

0 commit comments

Comments
 (0)