mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-28 05:29:48 +00:00
Repocopy from qt30. Modified to current status.
NOT TO BE USED AS A DEPENDENCY UNTIL AFTER 5.0 RELEASE!!!!
This commit is contained in:
Alan Eldridge
parent
852a4f007b
commit
d1662ca0ad
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=72632
@ -1,3 +1,4 @@
|
||||
# -*-mode: makefile-*-
|
||||
# New ports collection makefile for: qt-copy
|
||||
# Date created: 2 November 2001
|
||||
# Whom: will@cvs.kde.org
|
||||
@ -5,115 +6,87 @@
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
PORTNAME?= qt
|
||||
PORTVERSION?= 3.0.5
|
||||
PORTREVISION?= 5
|
||||
PORTNAME= qt
|
||||
PORTVERSION= 3.1.1
|
||||
CATEGORIES?= x11-toolkits
|
||||
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
|
||||
ftp://ftp.chg.ru/pub/X11/qt/source/
|
||||
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
|
||||
ftp://ftp.silug.org/pub/qt/ \
|
||||
ftp://ftp.bero.org/pub/qt/ \
|
||||
ftp://ftp.planetmirror.com.au/pub/trolltech/qt/
|
||||
|
||||
DISTNAME= qt-x11-free-${PORTVERSION}
|
||||
DIST_SUBDIR= KDE
|
||||
|
||||
MAINTAINER?= kde@FreeBSD.org
|
||||
|
||||
LIB_DEPENDS= mng.1:${PORTSDIR}/graphics/libmng \
|
||||
LIB_DEPENDS+= mng.1:${PORTSDIR}/graphics/libmng \
|
||||
png.5:${PORTSDIR}/graphics/png \
|
||||
jpeg.9:${PORTSDIR}/graphics/jpeg
|
||||
jpeg.9:${PORTSDIR}/graphics/jpeg \
|
||||
cups.2:${PORTSDIR}/print/cups-base
|
||||
|
||||
QT_PREFIX?= ${PREFIX}
|
||||
USE_BZIP2= yes
|
||||
USE_GMAKE= yes
|
||||
USE_REINPLACE= yes
|
||||
REINPLACE_ARGS= -i ""
|
||||
USE_X_PREFIX= yes
|
||||
NO_FILTER_SHLIBS= yes
|
||||
HAS_CONFIGURE= yes
|
||||
CONFIGURE_ARGS= -prefix ${QT_PREFIX} \
|
||||
-shared -qt-gif -system-zlib \
|
||||
-no-g++-exceptions -thread -no-stl \
|
||||
-qt-imgfmt-png \
|
||||
-qt-imgfmt-jpeg \
|
||||
-qt-imgfmt-mng \
|
||||
-system-libpng -system-libjpeg -system-libmng \
|
||||
-no-nas-sound -sm \
|
||||
-docdir ${QT_PREFIX}/share/doc/qt \
|
||||
-I${LOCALBASE}/include -L${LOCALBASE}/lib
|
||||
USE_BZIP2= yes
|
||||
USE_GMAKE= yes
|
||||
USE_X_PREFIX= yes
|
||||
HAS_CONFIGURE= yes
|
||||
INSTALLS_SHLIB= yes
|
||||
NO_FILTER_SHLIBS=yes
|
||||
CONFIGURE_ARGS= -system-libpng -system-libjpeg -system-libmng \
|
||||
-qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng \
|
||||
-system-zlib -sm -qt-gif -thread -no-fast \
|
||||
${XINERAMA} -no-g++-exceptions -no-stl ${CUPS} \
|
||||
-shared -prefix ${PREFIX}
|
||||
|
||||
.if defined(WITH_DEBUG)
|
||||
CONFIGURE_ARGS+=-debug
|
||||
.endif # defined(WITH_DEBUG)
|
||||
|
||||
# backward compatibility
|
||||
.if defined(WITH_OPENGL)
|
||||
.undef WITHOUT_OPENFL
|
||||
.endif # defined(WITH_OPENGL)
|
||||
.if defined(DEBUG)
|
||||
CONFIGURE_ARGS+= -debug
|
||||
.endif
|
||||
|
||||
.if !defined(WITHOUT_OPENGL)
|
||||
USE_MESA= yes
|
||||
PLIST_SUB+= OPENGL=""
|
||||
.else # WITHOUT_OPENGL
|
||||
PLIST_SUB+= OPENGL="@comment "
|
||||
.else
|
||||
CONFIGURE_ARGS+=-disable-opengl
|
||||
.endif # WITHOUT_OPENGL
|
||||
|
||||
CONFIGURE_ENV= ${ECHO} yes | QTDIR="${WRKSRC}" \
|
||||
CFLAGS="${CXXFLAGS}"
|
||||
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib
|
||||
ALL_TARGET= symlinks sub-src sub-tools
|
||||
.if defined(WITH_XINERAMA)
|
||||
XINERAMA= -xinerama
|
||||
PKGNAMESUFFIX= -xinerama
|
||||
.else
|
||||
XINERAMA= -no-xinerama
|
||||
.endif # defined(WITH_XINERAMA)
|
||||
|
||||
CUPS= -cups -L/usr/local/lib -I/usr/local/include
|
||||
|
||||
CONFIGURE_ENV= ${ECHO} yes | QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
|
||||
MAKE_ENV?= QTDIR=${WRKSRC} \
|
||||
LD_LIBRARY_PATH=${WRKSRC}/lib \
|
||||
PATH=${WRKSRC}/bin:$$PATH
|
||||
ALL_TARGET= sub-tools
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if ${MACHINE_ARCH} == "alpha"
|
||||
CFLAGS+= -O0
|
||||
.endif # ${MACHINE_ARCH} == "alpha"
|
||||
|
||||
.if ${XFREE86_VERSION} < 4
|
||||
BROKEN= "The QT 3.x port does not support any XFree86 < 4.x"
|
||||
.endif # ${XFREE86_VERSION} < 4
|
||||
|
||||
pre-fetch:
|
||||
.if exists(${X11BASE}/include/qt2/qapp.h)
|
||||
@${ECHO}
|
||||
@${ECHO} " NOTICE"
|
||||
@${ECHO}
|
||||
@${ECHO} "You have QT2 headers installed! Installing this port"
|
||||
@${ECHO} "will result in conflicts between QT3 and QT2!"
|
||||
@${FALSE}
|
||||
.endif
|
||||
|
||||
# Remove unneeded dirs (speedup) and netscape files (build barfs).
|
||||
post-patch:
|
||||
@${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -fr
|
||||
@${RM} -fr ${WRKSRC}/examples ${WRKSRC}/tutorial
|
||||
@cd ${WRKSRC}/include; \
|
||||
${RM} -f jri.h jri_md.h jritypes.h npapi.h npupp.h
|
||||
@cd ${WRKSRC}/extensions/nsplugin/src; \
|
||||
${RM} -f jri.h jri_md.h jritypes.h npapi.h npupp.h \
|
||||
npunix.c npwin.cpp
|
||||
${REINPLACE_CMD} -e 's,-O2,${CXXFLAGS},' \
|
||||
${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
|
||||
@${REINPLACE_CMD} -e 's,gcc,${CC},' \
|
||||
${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
|
||||
@${REINPLACE_CMD} -e 's,g++,${CXX},' \
|
||||
${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
|
||||
@${REINPLACE_CMD} -e 's,release,release thread,' \
|
||||
${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
|
||||
.if ${XFREE86_VERSION} < 4
|
||||
BROKEN= "The QT ${PORTVERSION} port does not support any XFree86 < 4.x"
|
||||
.endif # ${XFREE86_VERSION} < 4
|
||||
|
||||
.if exists(${X11BASE}/include/qt2/qapp.h)
|
||||
BROKEN= "You have QT2 headers installed! Installing this port"
|
||||
BROKEN+="will result in conflicts between QT3 and QT2!"
|
||||
.endif
|
||||
|
||||
post-build:
|
||||
cd ${WRKSRC}/tools/makeqpf/; ${SETENV} ${MAKE_ENV} ${MAKE}
|
||||
cd ${WRKSRC}/tools/mergetr/; ${SETENV} ${MAKE_ENV} ${MAKE}
|
||||
cd ${WRKSRC}/tools/msg2qm/; ${SETENV} ${MAKE_ENV} ${MAKE}
|
||||
cd ${WRKSRC}/tools/qembed/; ${SETENV} ${MAKE_ENV} ${MAKE}
|
||||
cd ${WRKSRC}/tools/qvfb/; ${SETENV} ${MAKE_ENV} ${MAKE}
|
||||
.for tool in makeqpf mergetr msg2qm qembed qvfb
|
||||
cd ${WRKSRC}/tools/${tool}; ${SETENV} ${MAKE_ENV} ${MAKE}
|
||||
.endfor
|
||||
|
||||
# Work around qmake generated dependencies
|
||||
pre-install:
|
||||
@${INSTALL_DATA} ${WRKSRC}/lib/*.prl ${PREFIX}/lib
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/tools/makeqpf/makeqpf ${PREFIX}/bin
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/tools/mergetr/mergetr ${PREFIX}/bin
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/tools/msg2qm/msg2qm ${PREFIX}/bin
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/tools/qembed/qembed ${PREFIX}/bin
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/tools/qvfb/qvfb ${PREFIX}/bin
|
||||
${INSTALL_SCRIPT} ${WRKSRC}/bin/findtr ${PREFIX}/bin
|
||||
.for tool in makeqpf mergetr msg2qm qembed qvfb
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/tools/${tool}/${tool} ${PREFIX}/bin
|
||||
.endfor
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
||||
@ -1 +1 @@
|
||||
MD5 (KDE/qt-x11-free-3.0.5.tar.bz2) = 3c937bf8f39a29af0a17b2a2b156790e
|
||||
MD5 (KDE/qt-x11-free-3.1.1.tar.bz2) = 977b9f59eed14f33343a797544b5418a
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
--- config.tests/x11/xfreetype.test.orig Wed Nov 13 04:52:27 2002
|
||||
+++ config.tests/x11/xfreetype.test Sun Dec 29 07:11:17 2002
|
||||
@@ -37,7 +37,7 @@
|
||||
LIBDIRS="$IN_LIBDIRS $XDIRS /usr/shlib /usr/lib /lib"
|
||||
F=
|
||||
for LIBDIR in $LIBDIRS; do
|
||||
- LIBS="Xft2 Xft"
|
||||
+ LIBS="Xft Xft2"
|
||||
for LIB in $LIBS; do
|
||||
FOUND_LIB=`ls ${LIBDIR}/lib${LIB}.* 2>/dev/null`
|
||||
if [ ! -z "$FOUND_LIB" ]; then
|
||||
10
x11-toolkits/qt31/files/patch-qanimationwriter.cpp
Normal file
10
x11-toolkits/qt31/files/patch-qanimationwriter.cpp
Normal file
@ -0,0 +1,10 @@
|
||||
--- tools/qvfb/qanimationwriter.cpp.orig Wed Nov 27 02:45:38 2002
|
||||
+++ tools/qvfb/qanimationwriter.cpp Wed Nov 27 02:45:56 2002
|
||||
@@ -25,6 +25,7 @@
|
||||
|
||||
#include <png.h>
|
||||
#include <netinet/in.h> // for htonl
|
||||
+#include <limits.h>
|
||||
|
||||
class QAnimationWriterData {
|
||||
public:
|
||||
11
x11-toolkits/qt31/files/patch-qfiledialog.cpp
Normal file
11
x11-toolkits/qt31/files/patch-qfiledialog.cpp
Normal file
@ -0,0 +1,11 @@
|
||||
--- src/dialogs/qfiledialog.cpp Thu Nov 7 14:07:21 2002
|
||||
+++ /cvs/qt-copy/src/dialogs/qfiledialog.cpp Thu Nov 21 13:06:09 2002
|
||||
@@ -3170,7 +3170,7 @@
|
||||
user = dr.mid( 1, i-1 ).local8Bit();
|
||||
dr = dr.mid( i, dr.length() );
|
||||
struct passwd *pw;
|
||||
-#if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
|
||||
+#if 0
|
||||
struct passwd mt_pw;
|
||||
char buffer[2048];
|
||||
if ( ::getpwnam_r( user, &mt_pw, buffer, 2048, &pw ) == 0 && pw == &mt_pw )
|
||||
10
x11-toolkits/qt31/files/patch-qlock.cpp
Normal file
10
x11-toolkits/qt31/files/patch-qlock.cpp
Normal file
@ -0,0 +1,10 @@
|
||||
--- src/kernel/qlock.cpp.orig Mon Dec 9 04:40:45 2002
|
||||
+++ src/kernel/qlock.cpp Sun Dec 29 05:31:54 2002
|
||||
@@ -41,6 +41,7 @@
|
||||
#include <sys/file.h>
|
||||
#else
|
||||
#include <sys/types.h>
|
||||
+#include <sys/ipc.h>
|
||||
#include <sys/sem.h>
|
||||
#if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) \
|
||||
|| defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) || defined(Q_OS_BSDI)
|
||||
@ -1,7 +0,0 @@
|
||||
--- qmake/GNUmakefile.in Fri Apr 12 06:20:21 2002
|
||||
+++ qmake/GNUmakefile.in Fri Jul 19 12:44:25 2002
|
||||
@@ -13,3 +13,3 @@
|
||||
|
||||
-CFLAGS=@QMAKE_CFLAGS@ -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
|
||||
+CFLAGS+=@QMAKE_CFLAGS@ -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
|
||||
-I@OUT_QTDIR@/include -I@REL_QTDIR@/include -I@OUT_QTDIR@/src/tools \
|
||||
74
x11-toolkits/qt31/files/qapplication.cpp.diff
Normal file
74
x11-toolkits/qt31/files/qapplication.cpp.diff
Normal file
@ -0,0 +1,74 @@
|
||||
===================================================================
|
||||
RCS file: /home2/webcvs/mirror/qt-copy/src/kernel/qapplication.cpp,v
|
||||
retrieving revision 1.61
|
||||
retrieving revision 1.62
|
||||
diff -u -p -r1.61 -r1.62
|
||||
--- qt-copy/src/kernel/qapplication.cpp 2002/11/13 16:46:34 1.61
|
||||
+++ qt-copy/src/kernel/qapplication.cpp 2002/11/14 08:57:34 1.62
|
||||
@@ -3257,6 +3257,66 @@ Q_EXPORT void qt_dispatchEnterLeave( QWi
|
||||
}
|
||||
|
||||
|
||||
+#ifdef Q_WS_MACX
|
||||
+extern QWidget *qt_tryModalHelperMac( QWidget * top ); //qapplication_mac.cpp
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
+/*!\internal
|
||||
+
|
||||
+ Called from qapplication_<platform>.cpp, returns TRUE
|
||||
+ if the widget should accept the event.
|
||||
+ */
|
||||
+bool qt_tryModalHelper( QWidget *widget, QWidget **rettop ) {
|
||||
+ QWidget *modal=0, *top=QApplication::activeModalWidget();
|
||||
+ if ( rettop ) *rettop = top;
|
||||
+
|
||||
+ if ( qApp->activePopupWidget() )
|
||||
+ return TRUE;
|
||||
+
|
||||
+#ifdef Q_WS_MACX
|
||||
+ top = qt_tryModalHelperMac( top );
|
||||
+ if ( rettop ) *rettop = top;
|
||||
+#endif
|
||||
+
|
||||
+ QWidget* groupLeader = widget;
|
||||
+ widget = widget->topLevelWidget();
|
||||
+
|
||||
+ if ( widget->testWFlags(Qt::WShowModal) ) // widget is modal
|
||||
+ modal = widget;
|
||||
+ if ( !top || modal == top ) // don't block event
|
||||
+ return TRUE;
|
||||
+
|
||||
+ QWidget * p = widget->parentWidget(); // Check if the active modal widget is a parent of our widget
|
||||
+ while ( p ) {
|
||||
+ if ( p == top )
|
||||
+ return TRUE;
|
||||
+ p = p->parentWidget();
|
||||
+ }
|
||||
+
|
||||
+ while ( groupLeader && !groupLeader->testWFlags( Qt::WGroupLeader ) )
|
||||
+ groupLeader = groupLeader->parentWidget();
|
||||
+
|
||||
+ if ( groupLeader ) {
|
||||
+ // Does groupLeader have a child in qt_modal_stack?
|
||||
+ bool unrelated = TRUE;
|
||||
+ modal = qt_modal_stack->first();
|
||||
+ while (modal && unrelated) {
|
||||
+ QWidget* p = modal->parentWidget();
|
||||
+ while ( p && p != groupLeader && !p->testWFlags( Qt::WGroupLeader) ) {
|
||||
+ p = p->parentWidget();
|
||||
+ }
|
||||
+ modal = qt_modal_stack->next();
|
||||
+ if ( p == groupLeader ) unrelated = FALSE;
|
||||
+ }
|
||||
+
|
||||
+ if ( unrelated )
|
||||
+ return TRUE; // don't block event
|
||||
+ }
|
||||
+ return FALSE;
|
||||
+}
|
||||
+
|
||||
+
|
||||
/*!
|
||||
Returns the desktop widget (also called the root window).
|
||||
|
||||
16
x11-toolkits/qt31/files/qapplication_p.h.diff
Normal file
16
x11-toolkits/qt31/files/qapplication_p.h.diff
Normal file
@ -0,0 +1,16 @@
|
||||
===================================================================
|
||||
RCS file: /home2/webcvs/mirror/qt-copy/src/kernel/qapplication_p.h,v
|
||||
retrieving revision 1.21
|
||||
retrieving revision 1.22
|
||||
diff -u -p -r1.21 -r1.22
|
||||
--- qt-copy/src/kernel/qapplication_p.h 2002/11/13 16:46:34 1.21
|
||||
+++ qt-copy/src/kernel/qapplication_p.h 2002/11/14 08:57:34 1.22
|
||||
@@ -83,7 +83,6 @@ extern int qt_ncols_option;
|
||||
|
||||
|
||||
extern void qt_dispatchEnterLeave( QWidget*, QWidget* );
|
||||
-
|
||||
-
|
||||
+extern bool qt_tryModalHelper( QWidget *, QWidget ** = 0 );
|
||||
|
||||
#endif
|
||||
48
x11-toolkits/qt31/files/qapplication_x11.cpp.diff
Normal file
48
x11-toolkits/qt31/files/qapplication_x11.cpp.diff
Normal file
@ -0,0 +1,48 @@
|
||||
===================================================================
|
||||
RCS file: /home2/webcvs/mirror/qt-copy/src/kernel/qapplication_x11.cpp,v
|
||||
retrieving revision 1.81
|
||||
retrieving revision 1.82
|
||||
diff -u -p -r1.81 -r1.82
|
||||
--- qt-copy/src/kernel/qapplication_x11.cpp 2002/11/13 16:46:34 1.81
|
||||
+++ qt-copy/src/kernel/qapplication_x11.cpp 2002/11/14 08:57:34 1.82
|
||||
@@ -3691,39 +3691,9 @@ void qt_leave_modal( QWidget *widget )
|
||||
|
||||
bool qt_try_modal( QWidget *widget, XEvent *event )
|
||||
{
|
||||
- if ( qApp->activePopupWidget() )
|
||||
+ if ( qt_tryModalHelper( widget ) )
|
||||
return TRUE;
|
||||
|
||||
- QWidget *modal=0, *top=QApplication::activeModalWidget();
|
||||
-
|
||||
- QWidget* groupLeader = widget;
|
||||
- widget = widget->topLevelWidget();
|
||||
-
|
||||
- if ( widget->testWFlags(Qt::WShowModal) ) // widget is modal
|
||||
- modal = widget;
|
||||
- if ( !top || modal == top ) // don't block event
|
||||
- return TRUE;
|
||||
-
|
||||
- while ( groupLeader && !groupLeader->testWFlags( Qt::WGroupLeader ) )
|
||||
- groupLeader = groupLeader->parentWidget();
|
||||
-
|
||||
- if ( groupLeader ) {
|
||||
- // Does groupLeader have a child in qt_modal_stack?
|
||||
- bool unrelated = TRUE;
|
||||
- modal = qt_modal_stack->first();
|
||||
- while (modal && unrelated) {
|
||||
- QWidget* p = modal->parentWidget();
|
||||
- while ( p && p != groupLeader && !p->testWFlags( Qt::WGroupLeader) ) {
|
||||
- p = p->parentWidget();
|
||||
- }
|
||||
- modal = qt_modal_stack->next();
|
||||
- if ( p == groupLeader ) unrelated = FALSE;
|
||||
- }
|
||||
-
|
||||
- if ( unrelated )
|
||||
- return TRUE; // don't block event
|
||||
- }
|
||||
-
|
||||
bool block_event = FALSE;
|
||||
switch ( event->type ) {
|
||||
case ButtonPress: // disallow mouse/key events
|
||||
23
x11-toolkits/qt31/files/qeffects.cpp.diff
Normal file
23
x11-toolkits/qt31/files/qeffects.cpp.diff
Normal file
@ -0,0 +1,23 @@
|
||||
===================================================================
|
||||
RCS file: /home2/webcvs/mirror/qt-copy/src/widgets/qeffects.cpp,v
|
||||
retrieving revision 1.18
|
||||
retrieving revision 1.19
|
||||
diff -u -p -r1.18 -r1.19
|
||||
--- qt-copy/src/widgets/qeffects.cpp 2002/10/30 01:54:25 1.18
|
||||
+++ qt-copy/src/widgets/qeffects.cpp 2002/11/21 01:30:32 1.19
|
||||
@@ -275,6 +275,7 @@ void QAlphaWidget::render()
|
||||
q_blend = 0;
|
||||
deleteLater();
|
||||
} else {
|
||||
+ widget->clearWState( WState_ForceHide );
|
||||
alphaBlend();
|
||||
pm = mixed;
|
||||
repaint( FALSE );
|
||||
@@ -505,6 +506,7 @@ void QRollEffect::run( int time )
|
||||
void QRollEffect::scroll()
|
||||
{
|
||||
if ( !done ) {
|
||||
+ widget->clearWState( WState_ForceHide );
|
||||
int tempel = checkTime.elapsed();
|
||||
if ( elapsed >= tempel )
|
||||
elapsed++;
|
||||
15
x11-toolkits/qt31/files/qwidget_x11.cpp.diff
Normal file
15
x11-toolkits/qt31/files/qwidget_x11.cpp.diff
Normal file
@ -0,0 +1,15 @@
|
||||
===================================================================
|
||||
RCS file: /home2/webcvs/mirror/qt-copy/src/kernel/qwidget_x11.cpp,v
|
||||
retrieving revision 1.55
|
||||
retrieving revision 1.56
|
||||
diff -u -p -r1.55 -r1.56
|
||||
--- qt-copy/src/kernel/qwidget_x11.cpp 2002/11/13 16:46:35 1.55
|
||||
+++ qt-copy/src/kernel/qwidget_x11.cpp 2002/11/13 17:28:42 1.56
|
||||
@@ -1561,7 +1561,6 @@ void QWidget::showMinimized()
|
||||
else {
|
||||
topData()->showMode = 1;
|
||||
show();
|
||||
- hideChildren( FALSE );
|
||||
}
|
||||
} else {
|
||||
show();
|
||||
@ -1,5 +1,5 @@
|
||||
Qt is a toolkit for building a GUI for X in C++. The main
|
||||
documentation is in share/doc/qt and is also available on
|
||||
documentation is in /usr/X11R6/doc/html and is also available on
|
||||
the web.
|
||||
|
||||
WWW: http://doc.trolltech.com/
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,3 +1,4 @@
|
||||
# -*-mode: makefile-*-
|
||||
# New ports collection makefile for: qt-copy
|
||||
# Date created: 2 November 2001
|
||||
# Whom: will@cvs.kde.org
|
||||
@ -5,115 +6,87 @@
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
PORTNAME?= qt
|
||||
PORTVERSION?= 3.0.5
|
||||
PORTREVISION?= 5
|
||||
PORTNAME= qt
|
||||
PORTVERSION= 3.1.1
|
||||
CATEGORIES?= x11-toolkits
|
||||
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
|
||||
ftp://ftp.chg.ru/pub/X11/qt/source/
|
||||
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
|
||||
ftp://ftp.silug.org/pub/qt/ \
|
||||
ftp://ftp.bero.org/pub/qt/ \
|
||||
ftp://ftp.planetmirror.com.au/pub/trolltech/qt/
|
||||
|
||||
DISTNAME= qt-x11-free-${PORTVERSION}
|
||||
DIST_SUBDIR= KDE
|
||||
|
||||
MAINTAINER?= kde@FreeBSD.org
|
||||
|
||||
LIB_DEPENDS= mng.1:${PORTSDIR}/graphics/libmng \
|
||||
LIB_DEPENDS+= mng.1:${PORTSDIR}/graphics/libmng \
|
||||
png.5:${PORTSDIR}/graphics/png \
|
||||
jpeg.9:${PORTSDIR}/graphics/jpeg
|
||||
jpeg.9:${PORTSDIR}/graphics/jpeg \
|
||||
cups.2:${PORTSDIR}/print/cups-base
|
||||
|
||||
QT_PREFIX?= ${PREFIX}
|
||||
USE_BZIP2= yes
|
||||
USE_GMAKE= yes
|
||||
USE_REINPLACE= yes
|
||||
REINPLACE_ARGS= -i ""
|
||||
USE_X_PREFIX= yes
|
||||
NO_FILTER_SHLIBS= yes
|
||||
HAS_CONFIGURE= yes
|
||||
CONFIGURE_ARGS= -prefix ${QT_PREFIX} \
|
||||
-shared -qt-gif -system-zlib \
|
||||
-no-g++-exceptions -thread -no-stl \
|
||||
-qt-imgfmt-png \
|
||||
-qt-imgfmt-jpeg \
|
||||
-qt-imgfmt-mng \
|
||||
-system-libpng -system-libjpeg -system-libmng \
|
||||
-no-nas-sound -sm \
|
||||
-docdir ${QT_PREFIX}/share/doc/qt \
|
||||
-I${LOCALBASE}/include -L${LOCALBASE}/lib
|
||||
USE_BZIP2= yes
|
||||
USE_GMAKE= yes
|
||||
USE_X_PREFIX= yes
|
||||
HAS_CONFIGURE= yes
|
||||
INSTALLS_SHLIB= yes
|
||||
NO_FILTER_SHLIBS=yes
|
||||
CONFIGURE_ARGS= -system-libpng -system-libjpeg -system-libmng \
|
||||
-qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng \
|
||||
-system-zlib -sm -qt-gif -thread -no-fast \
|
||||
${XINERAMA} -no-g++-exceptions -no-stl ${CUPS} \
|
||||
-shared -prefix ${PREFIX}
|
||||
|
||||
.if defined(WITH_DEBUG)
|
||||
CONFIGURE_ARGS+=-debug
|
||||
.endif # defined(WITH_DEBUG)
|
||||
|
||||
# backward compatibility
|
||||
.if defined(WITH_OPENGL)
|
||||
.undef WITHOUT_OPENFL
|
||||
.endif # defined(WITH_OPENGL)
|
||||
.if defined(DEBUG)
|
||||
CONFIGURE_ARGS+= -debug
|
||||
.endif
|
||||
|
||||
.if !defined(WITHOUT_OPENGL)
|
||||
USE_MESA= yes
|
||||
PLIST_SUB+= OPENGL=""
|
||||
.else # WITHOUT_OPENGL
|
||||
PLIST_SUB+= OPENGL="@comment "
|
||||
.else
|
||||
CONFIGURE_ARGS+=-disable-opengl
|
||||
.endif # WITHOUT_OPENGL
|
||||
|
||||
CONFIGURE_ENV= ${ECHO} yes | QTDIR="${WRKSRC}" \
|
||||
CFLAGS="${CXXFLAGS}"
|
||||
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib
|
||||
ALL_TARGET= symlinks sub-src sub-tools
|
||||
.if defined(WITH_XINERAMA)
|
||||
XINERAMA= -xinerama
|
||||
PKGNAMESUFFIX= -xinerama
|
||||
.else
|
||||
XINERAMA= -no-xinerama
|
||||
.endif # defined(WITH_XINERAMA)
|
||||
|
||||
CUPS= -cups -L/usr/local/lib -I/usr/local/include
|
||||
|
||||
CONFIGURE_ENV= ${ECHO} yes | QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
|
||||
MAKE_ENV?= QTDIR=${WRKSRC} \
|
||||
LD_LIBRARY_PATH=${WRKSRC}/lib \
|
||||
PATH=${WRKSRC}/bin:$$PATH
|
||||
ALL_TARGET= sub-tools
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if ${MACHINE_ARCH} == "alpha"
|
||||
CFLAGS+= -O0
|
||||
.endif # ${MACHINE_ARCH} == "alpha"
|
||||
|
||||
.if ${XFREE86_VERSION} < 4
|
||||
BROKEN= "The QT 3.x port does not support any XFree86 < 4.x"
|
||||
.endif # ${XFREE86_VERSION} < 4
|
||||
|
||||
pre-fetch:
|
||||
.if exists(${X11BASE}/include/qt2/qapp.h)
|
||||
@${ECHO}
|
||||
@${ECHO} " NOTICE"
|
||||
@${ECHO}
|
||||
@${ECHO} "You have QT2 headers installed! Installing this port"
|
||||
@${ECHO} "will result in conflicts between QT3 and QT2!"
|
||||
@${FALSE}
|
||||
.endif
|
||||
|
||||
# Remove unneeded dirs (speedup) and netscape files (build barfs).
|
||||
post-patch:
|
||||
@${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -fr
|
||||
@${RM} -fr ${WRKSRC}/examples ${WRKSRC}/tutorial
|
||||
@cd ${WRKSRC}/include; \
|
||||
${RM} -f jri.h jri_md.h jritypes.h npapi.h npupp.h
|
||||
@cd ${WRKSRC}/extensions/nsplugin/src; \
|
||||
${RM} -f jri.h jri_md.h jritypes.h npapi.h npupp.h \
|
||||
npunix.c npwin.cpp
|
||||
${REINPLACE_CMD} -e 's,-O2,${CXXFLAGS},' \
|
||||
${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
|
||||
@${REINPLACE_CMD} -e 's,gcc,${CC},' \
|
||||
${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
|
||||
@${REINPLACE_CMD} -e 's,g++,${CXX},' \
|
||||
${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
|
||||
@${REINPLACE_CMD} -e 's,release,release thread,' \
|
||||
${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
|
||||
.if ${XFREE86_VERSION} < 4
|
||||
BROKEN= "The QT ${PORTVERSION} port does not support any XFree86 < 4.x"
|
||||
.endif # ${XFREE86_VERSION} < 4
|
||||
|
||||
.if exists(${X11BASE}/include/qt2/qapp.h)
|
||||
BROKEN= "You have QT2 headers installed! Installing this port"
|
||||
BROKEN+="will result in conflicts between QT3 and QT2!"
|
||||
.endif
|
||||
|
||||
post-build:
|
||||
cd ${WRKSRC}/tools/makeqpf/; ${SETENV} ${MAKE_ENV} ${MAKE}
|
||||
cd ${WRKSRC}/tools/mergetr/; ${SETENV} ${MAKE_ENV} ${MAKE}
|
||||
cd ${WRKSRC}/tools/msg2qm/; ${SETENV} ${MAKE_ENV} ${MAKE}
|
||||
cd ${WRKSRC}/tools/qembed/; ${SETENV} ${MAKE_ENV} ${MAKE}
|
||||
cd ${WRKSRC}/tools/qvfb/; ${SETENV} ${MAKE_ENV} ${MAKE}
|
||||
.for tool in makeqpf mergetr msg2qm qembed qvfb
|
||||
cd ${WRKSRC}/tools/${tool}; ${SETENV} ${MAKE_ENV} ${MAKE}
|
||||
.endfor
|
||||
|
||||
# Work around qmake generated dependencies
|
||||
pre-install:
|
||||
@${INSTALL_DATA} ${WRKSRC}/lib/*.prl ${PREFIX}/lib
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/tools/makeqpf/makeqpf ${PREFIX}/bin
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/tools/mergetr/mergetr ${PREFIX}/bin
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/tools/msg2qm/msg2qm ${PREFIX}/bin
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/tools/qembed/qembed ${PREFIX}/bin
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/tools/qvfb/qvfb ${PREFIX}/bin
|
||||
${INSTALL_SCRIPT} ${WRKSRC}/bin/findtr ${PREFIX}/bin
|
||||
.for tool in makeqpf mergetr msg2qm qembed qvfb
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/tools/${tool}/${tool} ${PREFIX}/bin
|
||||
.endfor
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
||||
@ -1 +1 @@
|
||||
MD5 (KDE/qt-x11-free-3.0.5.tar.bz2) = 3c937bf8f39a29af0a17b2a2b156790e
|
||||
MD5 (KDE/qt-x11-free-3.1.1.tar.bz2) = 977b9f59eed14f33343a797544b5418a
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
--- config.tests/x11/xfreetype.test.orig Wed Nov 13 04:52:27 2002
|
||||
+++ config.tests/x11/xfreetype.test Sun Dec 29 07:11:17 2002
|
||||
@@ -37,7 +37,7 @@
|
||||
LIBDIRS="$IN_LIBDIRS $XDIRS /usr/shlib /usr/lib /lib"
|
||||
F=
|
||||
for LIBDIR in $LIBDIRS; do
|
||||
- LIBS="Xft2 Xft"
|
||||
+ LIBS="Xft Xft2"
|
||||
for LIB in $LIBS; do
|
||||
FOUND_LIB=`ls ${LIBDIR}/lib${LIB}.* 2>/dev/null`
|
||||
if [ ! -z "$FOUND_LIB" ]; then
|
||||
10
x11-toolkits/qt32/files/patch-qanimationwriter.cpp
Normal file
10
x11-toolkits/qt32/files/patch-qanimationwriter.cpp
Normal file
@ -0,0 +1,10 @@
|
||||
--- tools/qvfb/qanimationwriter.cpp.orig Wed Nov 27 02:45:38 2002
|
||||
+++ tools/qvfb/qanimationwriter.cpp Wed Nov 27 02:45:56 2002
|
||||
@@ -25,6 +25,7 @@
|
||||
|
||||
#include <png.h>
|
||||
#include <netinet/in.h> // for htonl
|
||||
+#include <limits.h>
|
||||
|
||||
class QAnimationWriterData {
|
||||
public:
|
||||
11
x11-toolkits/qt32/files/patch-qfiledialog.cpp
Normal file
11
x11-toolkits/qt32/files/patch-qfiledialog.cpp
Normal file
@ -0,0 +1,11 @@
|
||||
--- src/dialogs/qfiledialog.cpp Thu Nov 7 14:07:21 2002
|
||||
+++ /cvs/qt-copy/src/dialogs/qfiledialog.cpp Thu Nov 21 13:06:09 2002
|
||||
@@ -3170,7 +3170,7 @@
|
||||
user = dr.mid( 1, i-1 ).local8Bit();
|
||||
dr = dr.mid( i, dr.length() );
|
||||
struct passwd *pw;
|
||||
-#if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
|
||||
+#if 0
|
||||
struct passwd mt_pw;
|
||||
char buffer[2048];
|
||||
if ( ::getpwnam_r( user, &mt_pw, buffer, 2048, &pw ) == 0 && pw == &mt_pw )
|
||||
10
x11-toolkits/qt32/files/patch-qlock.cpp
Normal file
10
x11-toolkits/qt32/files/patch-qlock.cpp
Normal file
@ -0,0 +1,10 @@
|
||||
--- src/kernel/qlock.cpp.orig Mon Dec 9 04:40:45 2002
|
||||
+++ src/kernel/qlock.cpp Sun Dec 29 05:31:54 2002
|
||||
@@ -41,6 +41,7 @@
|
||||
#include <sys/file.h>
|
||||
#else
|
||||
#include <sys/types.h>
|
||||
+#include <sys/ipc.h>
|
||||
#include <sys/sem.h>
|
||||
#if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) \
|
||||
|| defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) || defined(Q_OS_BSDI)
|
||||
@ -1,7 +0,0 @@
|
||||
--- qmake/GNUmakefile.in Fri Apr 12 06:20:21 2002
|
||||
+++ qmake/GNUmakefile.in Fri Jul 19 12:44:25 2002
|
||||
@@ -13,3 +13,3 @@
|
||||
|
||||
-CFLAGS=@QMAKE_CFLAGS@ -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
|
||||
+CFLAGS+=@QMAKE_CFLAGS@ -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
|
||||
-I@OUT_QTDIR@/include -I@REL_QTDIR@/include -I@OUT_QTDIR@/src/tools \
|
||||
74
x11-toolkits/qt32/files/qapplication.cpp.diff
Normal file
74
x11-toolkits/qt32/files/qapplication.cpp.diff
Normal file
@ -0,0 +1,74 @@
|
||||
===================================================================
|
||||
RCS file: /home2/webcvs/mirror/qt-copy/src/kernel/qapplication.cpp,v
|
||||
retrieving revision 1.61
|
||||
retrieving revision 1.62
|
||||
diff -u -p -r1.61 -r1.62
|
||||
--- qt-copy/src/kernel/qapplication.cpp 2002/11/13 16:46:34 1.61
|
||||
+++ qt-copy/src/kernel/qapplication.cpp 2002/11/14 08:57:34 1.62
|
||||
@@ -3257,6 +3257,66 @@ Q_EXPORT void qt_dispatchEnterLeave( QWi
|
||||
}
|
||||
|
||||
|
||||
+#ifdef Q_WS_MACX
|
||||
+extern QWidget *qt_tryModalHelperMac( QWidget * top ); //qapplication_mac.cpp
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
+/*!\internal
|
||||
+
|
||||
+ Called from qapplication_<platform>.cpp, returns TRUE
|
||||
+ if the widget should accept the event.
|
||||
+ */
|
||||
+bool qt_tryModalHelper( QWidget *widget, QWidget **rettop ) {
|
||||
+ QWidget *modal=0, *top=QApplication::activeModalWidget();
|
||||
+ if ( rettop ) *rettop = top;
|
||||
+
|
||||
+ if ( qApp->activePopupWidget() )
|
||||
+ return TRUE;
|
||||
+
|
||||
+#ifdef Q_WS_MACX
|
||||
+ top = qt_tryModalHelperMac( top );
|
||||
+ if ( rettop ) *rettop = top;
|
||||
+#endif
|
||||
+
|
||||
+ QWidget* groupLeader = widget;
|
||||
+ widget = widget->topLevelWidget();
|
||||
+
|
||||
+ if ( widget->testWFlags(Qt::WShowModal) ) // widget is modal
|
||||
+ modal = widget;
|
||||
+ if ( !top || modal == top ) // don't block event
|
||||
+ return TRUE;
|
||||
+
|
||||
+ QWidget * p = widget->parentWidget(); // Check if the active modal widget is a parent of our widget
|
||||
+ while ( p ) {
|
||||
+ if ( p == top )
|
||||
+ return TRUE;
|
||||
+ p = p->parentWidget();
|
||||
+ }
|
||||
+
|
||||
+ while ( groupLeader && !groupLeader->testWFlags( Qt::WGroupLeader ) )
|
||||
+ groupLeader = groupLeader->parentWidget();
|
||||
+
|
||||
+ if ( groupLeader ) {
|
||||
+ // Does groupLeader have a child in qt_modal_stack?
|
||||
+ bool unrelated = TRUE;
|
||||
+ modal = qt_modal_stack->first();
|
||||
+ while (modal && unrelated) {
|
||||
+ QWidget* p = modal->parentWidget();
|
||||
+ while ( p && p != groupLeader && !p->testWFlags( Qt::WGroupLeader) ) {
|
||||
+ p = p->parentWidget();
|
||||
+ }
|
||||
+ modal = qt_modal_stack->next();
|
||||
+ if ( p == groupLeader ) unrelated = FALSE;
|
||||
+ }
|
||||
+
|
||||
+ if ( unrelated )
|
||||
+ return TRUE; // don't block event
|
||||
+ }
|
||||
+ return FALSE;
|
||||
+}
|
||||
+
|
||||
+
|
||||
/*!
|
||||
Returns the desktop widget (also called the root window).
|
||||
|
||||
16
x11-toolkits/qt32/files/qapplication_p.h.diff
Normal file
16
x11-toolkits/qt32/files/qapplication_p.h.diff
Normal file
@ -0,0 +1,16 @@
|
||||
===================================================================
|
||||
RCS file: /home2/webcvs/mirror/qt-copy/src/kernel/qapplication_p.h,v
|
||||
retrieving revision 1.21
|
||||
retrieving revision 1.22
|
||||
diff -u -p -r1.21 -r1.22
|
||||
--- qt-copy/src/kernel/qapplication_p.h 2002/11/13 16:46:34 1.21
|
||||
+++ qt-copy/src/kernel/qapplication_p.h 2002/11/14 08:57:34 1.22
|
||||
@@ -83,7 +83,6 @@ extern int qt_ncols_option;
|
||||
|
||||
|
||||
extern void qt_dispatchEnterLeave( QWidget*, QWidget* );
|
||||
-
|
||||
-
|
||||
+extern bool qt_tryModalHelper( QWidget *, QWidget ** = 0 );
|
||||
|
||||
#endif
|
||||
48
x11-toolkits/qt32/files/qapplication_x11.cpp.diff
Normal file
48
x11-toolkits/qt32/files/qapplication_x11.cpp.diff
Normal file
@ -0,0 +1,48 @@
|
||||
===================================================================
|
||||
RCS file: /home2/webcvs/mirror/qt-copy/src/kernel/qapplication_x11.cpp,v
|
||||
retrieving revision 1.81
|
||||
retrieving revision 1.82
|
||||
diff -u -p -r1.81 -r1.82
|
||||
--- qt-copy/src/kernel/qapplication_x11.cpp 2002/11/13 16:46:34 1.81
|
||||
+++ qt-copy/src/kernel/qapplication_x11.cpp 2002/11/14 08:57:34 1.82
|
||||
@@ -3691,39 +3691,9 @@ void qt_leave_modal( QWidget *widget )
|
||||
|
||||
bool qt_try_modal( QWidget *widget, XEvent *event )
|
||||
{
|
||||
- if ( qApp->activePopupWidget() )
|
||||
+ if ( qt_tryModalHelper( widget ) )
|
||||
return TRUE;
|
||||
|
||||
- QWidget *modal=0, *top=QApplication::activeModalWidget();
|
||||
-
|
||||
- QWidget* groupLeader = widget;
|
||||
- widget = widget->topLevelWidget();
|
||||
-
|
||||
- if ( widget->testWFlags(Qt::WShowModal) ) // widget is modal
|
||||
- modal = widget;
|
||||
- if ( !top || modal == top ) // don't block event
|
||||
- return TRUE;
|
||||
-
|
||||
- while ( groupLeader && !groupLeader->testWFlags( Qt::WGroupLeader ) )
|
||||
- groupLeader = groupLeader->parentWidget();
|
||||
-
|
||||
- if ( groupLeader ) {
|
||||
- // Does groupLeader have a child in qt_modal_stack?
|
||||
- bool unrelated = TRUE;
|
||||
- modal = qt_modal_stack->first();
|
||||
- while (modal && unrelated) {
|
||||
- QWidget* p = modal->parentWidget();
|
||||
- while ( p && p != groupLeader && !p->testWFlags( Qt::WGroupLeader) ) {
|
||||
- p = p->parentWidget();
|
||||
- }
|
||||
- modal = qt_modal_stack->next();
|
||||
- if ( p == groupLeader ) unrelated = FALSE;
|
||||
- }
|
||||
-
|
||||
- if ( unrelated )
|
||||
- return TRUE; // don't block event
|
||||
- }
|
||||
-
|
||||
bool block_event = FALSE;
|
||||
switch ( event->type ) {
|
||||
case ButtonPress: // disallow mouse/key events
|
||||
23
x11-toolkits/qt32/files/qeffects.cpp.diff
Normal file
23
x11-toolkits/qt32/files/qeffects.cpp.diff
Normal file
@ -0,0 +1,23 @@
|
||||
===================================================================
|
||||
RCS file: /home2/webcvs/mirror/qt-copy/src/widgets/qeffects.cpp,v
|
||||
retrieving revision 1.18
|
||||
retrieving revision 1.19
|
||||
diff -u -p -r1.18 -r1.19
|
||||
--- qt-copy/src/widgets/qeffects.cpp 2002/10/30 01:54:25 1.18
|
||||
+++ qt-copy/src/widgets/qeffects.cpp 2002/11/21 01:30:32 1.19
|
||||
@@ -275,6 +275,7 @@ void QAlphaWidget::render()
|
||||
q_blend = 0;
|
||||
deleteLater();
|
||||
} else {
|
||||
+ widget->clearWState( WState_ForceHide );
|
||||
alphaBlend();
|
||||
pm = mixed;
|
||||
repaint( FALSE );
|
||||
@@ -505,6 +506,7 @@ void QRollEffect::run( int time )
|
||||
void QRollEffect::scroll()
|
||||
{
|
||||
if ( !done ) {
|
||||
+ widget->clearWState( WState_ForceHide );
|
||||
int tempel = checkTime.elapsed();
|
||||
if ( elapsed >= tempel )
|
||||
elapsed++;
|
||||
15
x11-toolkits/qt32/files/qwidget_x11.cpp.diff
Normal file
15
x11-toolkits/qt32/files/qwidget_x11.cpp.diff
Normal file
@ -0,0 +1,15 @@
|
||||
===================================================================
|
||||
RCS file: /home2/webcvs/mirror/qt-copy/src/kernel/qwidget_x11.cpp,v
|
||||
retrieving revision 1.55
|
||||
retrieving revision 1.56
|
||||
diff -u -p -r1.55 -r1.56
|
||||
--- qt-copy/src/kernel/qwidget_x11.cpp 2002/11/13 16:46:35 1.55
|
||||
+++ qt-copy/src/kernel/qwidget_x11.cpp 2002/11/13 17:28:42 1.56
|
||||
@@ -1561,7 +1561,6 @@ void QWidget::showMinimized()
|
||||
else {
|
||||
topData()->showMode = 1;
|
||||
show();
|
||||
- hideChildren( FALSE );
|
||||
}
|
||||
} else {
|
||||
show();
|
||||
@ -1,5 +1,5 @@
|
||||
Qt is a toolkit for building a GUI for X in C++. The main
|
||||
documentation is in share/doc/qt and is also available on
|
||||
documentation is in /usr/X11R6/doc/html and is also available on
|
||||
the web.
|
||||
|
||||
WWW: http://doc.trolltech.com/
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,3 +1,4 @@
|
||||
# -*-mode: makefile-*-
|
||||
# New ports collection makefile for: qt-copy
|
||||
# Date created: 2 November 2001
|
||||
# Whom: will@cvs.kde.org
|
||||
@ -5,115 +6,87 @@
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
PORTNAME?= qt
|
||||
PORTVERSION?= 3.0.5
|
||||
PORTREVISION?= 5
|
||||
PORTNAME= qt
|
||||
PORTVERSION= 3.1.1
|
||||
CATEGORIES?= x11-toolkits
|
||||
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
|
||||
ftp://ftp.chg.ru/pub/X11/qt/source/
|
||||
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
|
||||
ftp://ftp.silug.org/pub/qt/ \
|
||||
ftp://ftp.bero.org/pub/qt/ \
|
||||
ftp://ftp.planetmirror.com.au/pub/trolltech/qt/
|
||||
|
||||
DISTNAME= qt-x11-free-${PORTVERSION}
|
||||
DIST_SUBDIR= KDE
|
||||
|
||||
MAINTAINER?= kde@FreeBSD.org
|
||||
|
||||
LIB_DEPENDS= mng.1:${PORTSDIR}/graphics/libmng \
|
||||
LIB_DEPENDS+= mng.1:${PORTSDIR}/graphics/libmng \
|
||||
png.5:${PORTSDIR}/graphics/png \
|
||||
jpeg.9:${PORTSDIR}/graphics/jpeg
|
||||
jpeg.9:${PORTSDIR}/graphics/jpeg \
|
||||
cups.2:${PORTSDIR}/print/cups-base
|
||||
|
||||
QT_PREFIX?= ${PREFIX}
|
||||
USE_BZIP2= yes
|
||||
USE_GMAKE= yes
|
||||
USE_REINPLACE= yes
|
||||
REINPLACE_ARGS= -i ""
|
||||
USE_X_PREFIX= yes
|
||||
NO_FILTER_SHLIBS= yes
|
||||
HAS_CONFIGURE= yes
|
||||
CONFIGURE_ARGS= -prefix ${QT_PREFIX} \
|
||||
-shared -qt-gif -system-zlib \
|
||||
-no-g++-exceptions -thread -no-stl \
|
||||
-qt-imgfmt-png \
|
||||
-qt-imgfmt-jpeg \
|
||||
-qt-imgfmt-mng \
|
||||
-system-libpng -system-libjpeg -system-libmng \
|
||||
-no-nas-sound -sm \
|
||||
-docdir ${QT_PREFIX}/share/doc/qt \
|
||||
-I${LOCALBASE}/include -L${LOCALBASE}/lib
|
||||
USE_BZIP2= yes
|
||||
USE_GMAKE= yes
|
||||
USE_X_PREFIX= yes
|
||||
HAS_CONFIGURE= yes
|
||||
INSTALLS_SHLIB= yes
|
||||
NO_FILTER_SHLIBS=yes
|
||||
CONFIGURE_ARGS= -system-libpng -system-libjpeg -system-libmng \
|
||||
-qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng \
|
||||
-system-zlib -sm -qt-gif -thread -no-fast \
|
||||
${XINERAMA} -no-g++-exceptions -no-stl ${CUPS} \
|
||||
-shared -prefix ${PREFIX}
|
||||
|
||||
.if defined(WITH_DEBUG)
|
||||
CONFIGURE_ARGS+=-debug
|
||||
.endif # defined(WITH_DEBUG)
|
||||
|
||||
# backward compatibility
|
||||
.if defined(WITH_OPENGL)
|
||||
.undef WITHOUT_OPENFL
|
||||
.endif # defined(WITH_OPENGL)
|
||||
.if defined(DEBUG)
|
||||
CONFIGURE_ARGS+= -debug
|
||||
.endif
|
||||
|
||||
.if !defined(WITHOUT_OPENGL)
|
||||
USE_MESA= yes
|
||||
PLIST_SUB+= OPENGL=""
|
||||
.else # WITHOUT_OPENGL
|
||||
PLIST_SUB+= OPENGL="@comment "
|
||||
.else
|
||||
CONFIGURE_ARGS+=-disable-opengl
|
||||
.endif # WITHOUT_OPENGL
|
||||
|
||||
CONFIGURE_ENV= ${ECHO} yes | QTDIR="${WRKSRC}" \
|
||||
CFLAGS="${CXXFLAGS}"
|
||||
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib
|
||||
ALL_TARGET= symlinks sub-src sub-tools
|
||||
.if defined(WITH_XINERAMA)
|
||||
XINERAMA= -xinerama
|
||||
PKGNAMESUFFIX= -xinerama
|
||||
.else
|
||||
XINERAMA= -no-xinerama
|
||||
.endif # defined(WITH_XINERAMA)
|
||||
|
||||
CUPS= -cups -L/usr/local/lib -I/usr/local/include
|
||||
|
||||
CONFIGURE_ENV= ${ECHO} yes | QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
|
||||
MAKE_ENV?= QTDIR=${WRKSRC} \
|
||||
LD_LIBRARY_PATH=${WRKSRC}/lib \
|
||||
PATH=${WRKSRC}/bin:$$PATH
|
||||
ALL_TARGET= sub-tools
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if ${MACHINE_ARCH} == "alpha"
|
||||
CFLAGS+= -O0
|
||||
.endif # ${MACHINE_ARCH} == "alpha"
|
||||
|
||||
.if ${XFREE86_VERSION} < 4
|
||||
BROKEN= "The QT 3.x port does not support any XFree86 < 4.x"
|
||||
.endif # ${XFREE86_VERSION} < 4
|
||||
|
||||
pre-fetch:
|
||||
.if exists(${X11BASE}/include/qt2/qapp.h)
|
||||
@${ECHO}
|
||||
@${ECHO} " NOTICE"
|
||||
@${ECHO}
|
||||
@${ECHO} "You have QT2 headers installed! Installing this port"
|
||||
@${ECHO} "will result in conflicts between QT3 and QT2!"
|
||||
@${FALSE}
|
||||
.endif
|
||||
|
||||
# Remove unneeded dirs (speedup) and netscape files (build barfs).
|
||||
post-patch:
|
||||
@${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -fr
|
||||
@${RM} -fr ${WRKSRC}/examples ${WRKSRC}/tutorial
|
||||
@cd ${WRKSRC}/include; \
|
||||
${RM} -f jri.h jri_md.h jritypes.h npapi.h npupp.h
|
||||
@cd ${WRKSRC}/extensions/nsplugin/src; \
|
||||
${RM} -f jri.h jri_md.h jritypes.h npapi.h npupp.h \
|
||||
npunix.c npwin.cpp
|
||||
${REINPLACE_CMD} -e 's,-O2,${CXXFLAGS},' \
|
||||
${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
|
||||
@${REINPLACE_CMD} -e 's,gcc,${CC},' \
|
||||
${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
|
||||
@${REINPLACE_CMD} -e 's,g++,${CXX},' \
|
||||
${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
|
||||
@${REINPLACE_CMD} -e 's,release,release thread,' \
|
||||
${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
|
||||
.if ${XFREE86_VERSION} < 4
|
||||
BROKEN= "The QT ${PORTVERSION} port does not support any XFree86 < 4.x"
|
||||
.endif # ${XFREE86_VERSION} < 4
|
||||
|
||||
.if exists(${X11BASE}/include/qt2/qapp.h)
|
||||
BROKEN= "You have QT2 headers installed! Installing this port"
|
||||
BROKEN+="will result in conflicts between QT3 and QT2!"
|
||||
.endif
|
||||
|
||||
post-build:
|
||||
cd ${WRKSRC}/tools/makeqpf/; ${SETENV} ${MAKE_ENV} ${MAKE}
|
||||
cd ${WRKSRC}/tools/mergetr/; ${SETENV} ${MAKE_ENV} ${MAKE}
|
||||
cd ${WRKSRC}/tools/msg2qm/; ${SETENV} ${MAKE_ENV} ${MAKE}
|
||||
cd ${WRKSRC}/tools/qembed/; ${SETENV} ${MAKE_ENV} ${MAKE}
|
||||
cd ${WRKSRC}/tools/qvfb/; ${SETENV} ${MAKE_ENV} ${MAKE}
|
||||
.for tool in makeqpf mergetr msg2qm qembed qvfb
|
||||
cd ${WRKSRC}/tools/${tool}; ${SETENV} ${MAKE_ENV} ${MAKE}
|
||||
.endfor
|
||||
|
||||
# Work around qmake generated dependencies
|
||||
pre-install:
|
||||
@${INSTALL_DATA} ${WRKSRC}/lib/*.prl ${PREFIX}/lib
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/tools/makeqpf/makeqpf ${PREFIX}/bin
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/tools/mergetr/mergetr ${PREFIX}/bin
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/tools/msg2qm/msg2qm ${PREFIX}/bin
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/tools/qembed/qembed ${PREFIX}/bin
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/tools/qvfb/qvfb ${PREFIX}/bin
|
||||
${INSTALL_SCRIPT} ${WRKSRC}/bin/findtr ${PREFIX}/bin
|
||||
.for tool in makeqpf mergetr msg2qm qembed qvfb
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/tools/${tool}/${tool} ${PREFIX}/bin
|
||||
.endfor
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
||||
@ -1 +1 @@
|
||||
MD5 (KDE/qt-x11-free-3.0.5.tar.bz2) = 3c937bf8f39a29af0a17b2a2b156790e
|
||||
MD5 (KDE/qt-x11-free-3.1.1.tar.bz2) = 977b9f59eed14f33343a797544b5418a
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
--- config.tests/x11/xfreetype.test.orig Wed Nov 13 04:52:27 2002
|
||||
+++ config.tests/x11/xfreetype.test Sun Dec 29 07:11:17 2002
|
||||
@@ -37,7 +37,7 @@
|
||||
LIBDIRS="$IN_LIBDIRS $XDIRS /usr/shlib /usr/lib /lib"
|
||||
F=
|
||||
for LIBDIR in $LIBDIRS; do
|
||||
- LIBS="Xft2 Xft"
|
||||
+ LIBS="Xft Xft2"
|
||||
for LIB in $LIBS; do
|
||||
FOUND_LIB=`ls ${LIBDIR}/lib${LIB}.* 2>/dev/null`
|
||||
if [ ! -z "$FOUND_LIB" ]; then
|
||||
10
x11-toolkits/qt33/files/patch-qanimationwriter.cpp
Normal file
10
x11-toolkits/qt33/files/patch-qanimationwriter.cpp
Normal file
@ -0,0 +1,10 @@
|
||||
--- tools/qvfb/qanimationwriter.cpp.orig Wed Nov 27 02:45:38 2002
|
||||
+++ tools/qvfb/qanimationwriter.cpp Wed Nov 27 02:45:56 2002
|
||||
@@ -25,6 +25,7 @@
|
||||
|
||||
#include <png.h>
|
||||
#include <netinet/in.h> // for htonl
|
||||
+#include <limits.h>
|
||||
|
||||
class QAnimationWriterData {
|
||||
public:
|
||||
11
x11-toolkits/qt33/files/patch-qfiledialog.cpp
Normal file
11
x11-toolkits/qt33/files/patch-qfiledialog.cpp
Normal file
@ -0,0 +1,11 @@
|
||||
--- src/dialogs/qfiledialog.cpp Thu Nov 7 14:07:21 2002
|
||||
+++ /cvs/qt-copy/src/dialogs/qfiledialog.cpp Thu Nov 21 13:06:09 2002
|
||||
@@ -3170,7 +3170,7 @@
|
||||
user = dr.mid( 1, i-1 ).local8Bit();
|
||||
dr = dr.mid( i, dr.length() );
|
||||
struct passwd *pw;
|
||||
-#if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
|
||||
+#if 0
|
||||
struct passwd mt_pw;
|
||||
char buffer[2048];
|
||||
if ( ::getpwnam_r( user, &mt_pw, buffer, 2048, &pw ) == 0 && pw == &mt_pw )
|
||||
10
x11-toolkits/qt33/files/patch-qlock.cpp
Normal file
10
x11-toolkits/qt33/files/patch-qlock.cpp
Normal file
@ -0,0 +1,10 @@
|
||||
--- src/kernel/qlock.cpp.orig Mon Dec 9 04:40:45 2002
|
||||
+++ src/kernel/qlock.cpp Sun Dec 29 05:31:54 2002
|
||||
@@ -41,6 +41,7 @@
|
||||
#include <sys/file.h>
|
||||
#else
|
||||
#include <sys/types.h>
|
||||
+#include <sys/ipc.h>
|
||||
#include <sys/sem.h>
|
||||
#if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) \
|
||||
|| defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) || defined(Q_OS_BSDI)
|
||||
@ -1,7 +0,0 @@
|
||||
--- qmake/GNUmakefile.in Fri Apr 12 06:20:21 2002
|
||||
+++ qmake/GNUmakefile.in Fri Jul 19 12:44:25 2002
|
||||
@@ -13,3 +13,3 @@
|
||||
|
||||
-CFLAGS=@QMAKE_CFLAGS@ -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
|
||||
+CFLAGS+=@QMAKE_CFLAGS@ -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
|
||||
-I@OUT_QTDIR@/include -I@REL_QTDIR@/include -I@OUT_QTDIR@/src/tools \
|
||||
74
x11-toolkits/qt33/files/qapplication.cpp.diff
Normal file
74
x11-toolkits/qt33/files/qapplication.cpp.diff
Normal file
@ -0,0 +1,74 @@
|
||||
===================================================================
|
||||
RCS file: /home2/webcvs/mirror/qt-copy/src/kernel/qapplication.cpp,v
|
||||
retrieving revision 1.61
|
||||
retrieving revision 1.62
|
||||
diff -u -p -r1.61 -r1.62
|
||||
--- qt-copy/src/kernel/qapplication.cpp 2002/11/13 16:46:34 1.61
|
||||
+++ qt-copy/src/kernel/qapplication.cpp 2002/11/14 08:57:34 1.62
|
||||
@@ -3257,6 +3257,66 @@ Q_EXPORT void qt_dispatchEnterLeave( QWi
|
||||
}
|
||||
|
||||
|
||||
+#ifdef Q_WS_MACX
|
||||
+extern QWidget *qt_tryModalHelperMac( QWidget * top ); //qapplication_mac.cpp
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
+/*!\internal
|
||||
+
|
||||
+ Called from qapplication_<platform>.cpp, returns TRUE
|
||||
+ if the widget should accept the event.
|
||||
+ */
|
||||
+bool qt_tryModalHelper( QWidget *widget, QWidget **rettop ) {
|
||||
+ QWidget *modal=0, *top=QApplication::activeModalWidget();
|
||||
+ if ( rettop ) *rettop = top;
|
||||
+
|
||||
+ if ( qApp->activePopupWidget() )
|
||||
+ return TRUE;
|
||||
+
|
||||
+#ifdef Q_WS_MACX
|
||||
+ top = qt_tryModalHelperMac( top );
|
||||
+ if ( rettop ) *rettop = top;
|
||||
+#endif
|
||||
+
|
||||
+ QWidget* groupLeader = widget;
|
||||
+ widget = widget->topLevelWidget();
|
||||
+
|
||||
+ if ( widget->testWFlags(Qt::WShowModal) ) // widget is modal
|
||||
+ modal = widget;
|
||||
+ if ( !top || modal == top ) // don't block event
|
||||
+ return TRUE;
|
||||
+
|
||||
+ QWidget * p = widget->parentWidget(); // Check if the active modal widget is a parent of our widget
|
||||
+ while ( p ) {
|
||||
+ if ( p == top )
|
||||
+ return TRUE;
|
||||
+ p = p->parentWidget();
|
||||
+ }
|
||||
+
|
||||
+ while ( groupLeader && !groupLeader->testWFlags( Qt::WGroupLeader ) )
|
||||
+ groupLeader = groupLeader->parentWidget();
|
||||
+
|
||||
+ if ( groupLeader ) {
|
||||
+ // Does groupLeader have a child in qt_modal_stack?
|
||||
+ bool unrelated = TRUE;
|
||||
+ modal = qt_modal_stack->first();
|
||||
+ while (modal && unrelated) {
|
||||
+ QWidget* p = modal->parentWidget();
|
||||
+ while ( p && p != groupLeader && !p->testWFlags( Qt::WGroupLeader) ) {
|
||||
+ p = p->parentWidget();
|
||||
+ }
|
||||
+ modal = qt_modal_stack->next();
|
||||
+ if ( p == groupLeader ) unrelated = FALSE;
|
||||
+ }
|
||||
+
|
||||
+ if ( unrelated )
|
||||
+ return TRUE; // don't block event
|
||||
+ }
|
||||
+ return FALSE;
|
||||
+}
|
||||
+
|
||||
+
|
||||
/*!
|
||||
Returns the desktop widget (also called the root window).
|
||||
|
||||
16
x11-toolkits/qt33/files/qapplication_p.h.diff
Normal file
16
x11-toolkits/qt33/files/qapplication_p.h.diff
Normal file
@ -0,0 +1,16 @@
|
||||
===================================================================
|
||||
RCS file: /home2/webcvs/mirror/qt-copy/src/kernel/qapplication_p.h,v
|
||||
retrieving revision 1.21
|
||||
retrieving revision 1.22
|
||||
diff -u -p -r1.21 -r1.22
|
||||
--- qt-copy/src/kernel/qapplication_p.h 2002/11/13 16:46:34 1.21
|
||||
+++ qt-copy/src/kernel/qapplication_p.h 2002/11/14 08:57:34 1.22
|
||||
@@ -83,7 +83,6 @@ extern int qt_ncols_option;
|
||||
|
||||
|
||||
extern void qt_dispatchEnterLeave( QWidget*, QWidget* );
|
||||
-
|
||||
-
|
||||
+extern bool qt_tryModalHelper( QWidget *, QWidget ** = 0 );
|
||||
|
||||
#endif
|
||||
48
x11-toolkits/qt33/files/qapplication_x11.cpp.diff
Normal file
48
x11-toolkits/qt33/files/qapplication_x11.cpp.diff
Normal file
@ -0,0 +1,48 @@
|
||||
===================================================================
|
||||
RCS file: /home2/webcvs/mirror/qt-copy/src/kernel/qapplication_x11.cpp,v
|
||||
retrieving revision 1.81
|
||||
retrieving revision 1.82
|
||||
diff -u -p -r1.81 -r1.82
|
||||
--- qt-copy/src/kernel/qapplication_x11.cpp 2002/11/13 16:46:34 1.81
|
||||
+++ qt-copy/src/kernel/qapplication_x11.cpp 2002/11/14 08:57:34 1.82
|
||||
@@ -3691,39 +3691,9 @@ void qt_leave_modal( QWidget *widget )
|
||||
|
||||
bool qt_try_modal( QWidget *widget, XEvent *event )
|
||||
{
|
||||
- if ( qApp->activePopupWidget() )
|
||||
+ if ( qt_tryModalHelper( widget ) )
|
||||
return TRUE;
|
||||
|
||||
- QWidget *modal=0, *top=QApplication::activeModalWidget();
|
||||
-
|
||||
- QWidget* groupLeader = widget;
|
||||
- widget = widget->topLevelWidget();
|
||||
-
|
||||
- if ( widget->testWFlags(Qt::WShowModal) ) // widget is modal
|
||||
- modal = widget;
|
||||
- if ( !top || modal == top ) // don't block event
|
||||
- return TRUE;
|
||||
-
|
||||
- while ( groupLeader && !groupLeader->testWFlags( Qt::WGroupLeader ) )
|
||||
- groupLeader = groupLeader->parentWidget();
|
||||
-
|
||||
- if ( groupLeader ) {
|
||||
- // Does groupLeader have a child in qt_modal_stack?
|
||||
- bool unrelated = TRUE;
|
||||
- modal = qt_modal_stack->first();
|
||||
- while (modal && unrelated) {
|
||||
- QWidget* p = modal->parentWidget();
|
||||
- while ( p && p != groupLeader && !p->testWFlags( Qt::WGroupLeader) ) {
|
||||
- p = p->parentWidget();
|
||||
- }
|
||||
- modal = qt_modal_stack->next();
|
||||
- if ( p == groupLeader ) unrelated = FALSE;
|
||||
- }
|
||||
-
|
||||
- if ( unrelated )
|
||||
- return TRUE; // don't block event
|
||||
- }
|
||||
-
|
||||
bool block_event = FALSE;
|
||||
switch ( event->type ) {
|
||||
case ButtonPress: // disallow mouse/key events
|
||||
23
x11-toolkits/qt33/files/qeffects.cpp.diff
Normal file
23
x11-toolkits/qt33/files/qeffects.cpp.diff
Normal file
@ -0,0 +1,23 @@
|
||||
===================================================================
|
||||
RCS file: /home2/webcvs/mirror/qt-copy/src/widgets/qeffects.cpp,v
|
||||
retrieving revision 1.18
|
||||
retrieving revision 1.19
|
||||
diff -u -p -r1.18 -r1.19
|
||||
--- qt-copy/src/widgets/qeffects.cpp 2002/10/30 01:54:25 1.18
|
||||
+++ qt-copy/src/widgets/qeffects.cpp 2002/11/21 01:30:32 1.19
|
||||
@@ -275,6 +275,7 @@ void QAlphaWidget::render()
|
||||
q_blend = 0;
|
||||
deleteLater();
|
||||
} else {
|
||||
+ widget->clearWState( WState_ForceHide );
|
||||
alphaBlend();
|
||||
pm = mixed;
|
||||
repaint( FALSE );
|
||||
@@ -505,6 +506,7 @@ void QRollEffect::run( int time )
|
||||
void QRollEffect::scroll()
|
||||
{
|
||||
if ( !done ) {
|
||||
+ widget->clearWState( WState_ForceHide );
|
||||
int tempel = checkTime.elapsed();
|
||||
if ( elapsed >= tempel )
|
||||
elapsed++;
|
||||
15
x11-toolkits/qt33/files/qwidget_x11.cpp.diff
Normal file
15
x11-toolkits/qt33/files/qwidget_x11.cpp.diff
Normal file
@ -0,0 +1,15 @@
|
||||
===================================================================
|
||||
RCS file: /home2/webcvs/mirror/qt-copy/src/kernel/qwidget_x11.cpp,v
|
||||
retrieving revision 1.55
|
||||
retrieving revision 1.56
|
||||
diff -u -p -r1.55 -r1.56
|
||||
--- qt-copy/src/kernel/qwidget_x11.cpp 2002/11/13 16:46:35 1.55
|
||||
+++ qt-copy/src/kernel/qwidget_x11.cpp 2002/11/13 17:28:42 1.56
|
||||
@@ -1561,7 +1561,6 @@ void QWidget::showMinimized()
|
||||
else {
|
||||
topData()->showMode = 1;
|
||||
show();
|
||||
- hideChildren( FALSE );
|
||||
}
|
||||
} else {
|
||||
show();
|
||||
@ -1,5 +1,5 @@
|
||||
Qt is a toolkit for building a GUI for X in C++. The main
|
||||
documentation is in share/doc/qt and is also available on
|
||||
documentation is in /usr/X11R6/doc/html and is also available on
|
||||
the web.
|
||||
|
||||
WWW: http://doc.trolltech.com/
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user