head	1.1;
access;
symbols
	RELEASE_5_EOL:1.1
	RELEASE_7_0_0:1.1
	RELEASE_6_3_0:1.1
	PRE_XORG_7:1.1
	RELEASE_4_EOL:1.1
	RELEASE_6_2_0:1.1;
locks; strict;
comment	@# @;


1.1
date	2006.06.27.04.35.57;	author mi;	state Exp;
branches;
next	;


desc
@@


1.1
log
@Upgrade from 1.4.6 to 1.4.7. LIB_DEPEND on png and use the standard -lmd
instead of building our own versions.

The bundled qtools/ can be removed too, but that will make the port
always depend on Qt (hence X11), which it currently avoids.

Approved by:	maintainer timeout (13 days)
@
text
@--- qtools/qgdict.cpp	Wed Apr 13 15:51:44 2005
+++ qtools/qgdict.cpp	Wed Jun 14 01:43:49 2006
@@@@ -41,4 +41,5 @@@@
 #include "qdatastream.h"
 #include <ctype.h>
+#include <sys/types.h>
 
 // NOT REVISED
@@@@ -1005,5 +1006,5 @@@@
 	    case PtrKey:
 		{
-		    Q_UINT32 k;
+		    uintptr_t k;
 		    s >> k;
 		    read( s, d );
@
