blob: 5f1bd3ea07eb162984c4ef1976734aaf587a834f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
|
Index: tdesdk/cmake/modules/TDEMacros.cmake
===================================================================
--- tdesdk.orig/cmake/modules/TDEMacros.cmake
+++ tdesdk/cmake/modules/TDEMacros.cmake
@@ -833,7 +833,7 @@ macro( tde_add_library _arg_target )
# set embedded archives
if( _embed )
- list( INSERT _link 0 -Wl,-whole-archive ${_embed} -Wl,-no-whole-archive )
+ list( INSERT _link 0 -Wl,-zallextract ${_embed} -Wl,-zdefaultextract )
endif( _embed )
# set link libraries
Index: tdesdk/umbrello/umbrello/associationwidget.cpp
===================================================================
--- tdesdk.orig/umbrello/umbrello/associationwidget.cpp
+++ tdesdk/umbrello/umbrello/associationwidget.cpp
@@ -1893,7 +1893,7 @@ void AssociationWidget::constrainTextPos
const int y0 = p0.y();
const int x1 = p1.x();
const int y1 = p1.y();
- double r = sqrt((x1 - x0) * (x1 - x0) + (y1 - y0) * (y1 - y0)) / 2;
+ double r = sqrt((double)(x1 - x0) * (x1 - x0) + (y1 - y0) * (y1 - y0)) / 2;
if (textWidth > r)
r = textWidth;
// swap textCenter{X,Y} to convert from TQt coord.system.
|
