Import of pkgsrc-2016Q3

This commit is contained in:
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions

View File

@@ -0,0 +1,24 @@
$NetBSD: patch-modules_gui_qt4_components_interface__widgets.cpp,v 1.1 2015/10/25 11:00:18 wiz Exp $
Qt's MOC doesn't handle int64_t, so introduce a meaningful type name
so that slot/signal/connection macros work properly.
--- modules/gui/qt4/components/interface_widgets.cpp.orig 2015-01-22 14:50:00.000000000 +0000
+++ modules/gui/qt4/components/interface_widgets.cpp
@@ -759,13 +759,13 @@ TimeLabel::TimeLabel( intf_thread_t *_p_
}
setAlignment( Qt::AlignRight | Qt::AlignVCenter );
- CONNECT( THEMIM->getIM(), positionUpdated( float, int64_t, int ),
- this, setDisplayPosition( float, int64_t, int ) );
+ CONNECT( THEMIM->getIM(), positionUpdated( float, putime_t, int ),
+ this, setDisplayPosition( float, putime_t, int ) );
setStyleSheet( "QLabel { padding-left: 4px; padding-right: 4px; }" );
}
-void TimeLabel::setDisplayPosition( float pos, int64_t t, int length )
+void TimeLabel::setDisplayPosition( float pos, putime_t t, int length )
{
if( pos == -1.f )
{