kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add upstream commit that fixes a plasma-desktop crash in x11/kde4-workspace.

Browse source 
The upstream bug report can be found in [1], the commit itself is in [2].

[1] https://bugreports.qt-project.org/browse/QTBUG-29082
[2] f0221d3594

Submitted by:	avg
This commit is contained in:
Raphael Kubo da Costa 2013-07-09 22:15:01 +00:00
parent 16392411e0
commit ad7f8d0c30
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=322590
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
devel/qt4-corelib/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= corelib
DISTVERSION= ${QT4_VERSION}
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES?= devel
PKGNAMEPREFIX= qt4-

16
devel/qt4-corelib/files/patch-src__corelib__animation__qpropertyanimation.cpp Normal file
View file

@ -0,0 +1,16 @@
--- src/corelib/animation/qpropertyanimation.cpp.orig
+++ src/corelib/animation/qpropertyanimation.cpp
@@ -136,8 +136,11 @@ void QPropertyAnimationPrivate::updateProperty(const QVariant &newValue)
if (newValue.userType() == propertyType) {
//no conversion is needed, we directly call the QMetaObject::metacall
- void *data = const_cast<void*>(newValue.constData());
- QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, &data);
+ //check QMetaProperty::write for an explanation of these
+ int status = -1;
+ int flags = 0;
+ void *argv[] = { const_cast<void *>(newValue.constData()), const_cast<QVariant *>(&newValue), &status, &flags };
+ QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, argv);
} else {
targetValue->setProperty(propertyName.constData(), newValue);
}