--- examples/demo/demo.pro.orig	Sat Feb  9 17:15:03 2002
+++ examples/demo/demo.pro	Wed Mar 27 19:19:47 2002
@@ -31,8 +31,6 @@
 DEFINES		+= QT_INTERNAL_WORKSPACE
 DEFINES		+= QT_INTERNAL_CANVAS
 
-include( ../../src/qt_professional.pri )
-
 canvas {
 	HEADERS += graph.h \
 		  qasteroids/toplevel.h \
--- mkspecs/aix-g++/qmake.conf.orig	Mon Mar 18 09:45:56 2002
+++ mkspecs/aix-g++/qmake.conf	Wed Mar 27 19:19:47 2002
@@ -36,12 +36,12 @@
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
-QMAKE_INCDIR_X11	= /usr/X11R6/include
-QMAKE_LIBDIR_X11	= /usr/X11R6/lib
+QMAKE_INCDIR_X11	= /usr/include/X11
+QMAKE_LIBDIR_X11	=
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
-QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
-QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
+QMAKE_INCDIR_OPENGL	=
+QMAKE_LIBDIR_OPENGL	=
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
--- mkspecs/aix-xlc/qmake.conf.orig	Mon Mar 18 09:45:56 2002
+++ mkspecs/aix-xlc/qmake.conf	Wed Mar 27 19:19:47 2002
@@ -25,7 +25,7 @@
 
 QMAKE_CXX		= xlC
 QMAKE_CXX_THREAD	= xlC_r
-QMAKE_CXXFLAGS		= -+ $$QMAKE_CFLAGS
+QMAKE_CXXFLAGS		= -+ -qrtti=all $$QMAKE_CFLAGS
 QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
 QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
 QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE
@@ -36,7 +36,7 @@
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
-QMAKE_INCDIR_X11	=
+QMAKE_INCDIR_X11	= /usr/include/X11
 QMAKE_LIBDIR_X11	=
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
@@ -45,23 +45,17 @@
 
 QMAKE_LINK		= xlC
 QMAKE_LINK_THREAD	= xlC_r
-QMAKE_LINK_SHLIB	= ld
-QMAKE_LINK_SHLIB_CMD	= makeC++SharedLib -p 0 \
-			    -o $(TARGETD) \
-			    $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS); \
-			  ar q lib$(QMAKE_TARGET).a $(TARGETD); \
-			  ranlib lib$(QMAKE_TARGET).a; \
-			  mv lib$(QMAKE_TARGET).a $(DESTDIR)
-QMAKE_LFLAGS		=
+QMAKE_LINK_SHLIB	= xlC
+QMAKE_LFLAGS		= -Wl,-bbigtoc -qthreaded
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
-QMAKE_LFLAGS_SHLIB	=
+QMAKE_LFLAGS_SHLIB	= -qmkshrobj
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	=
 QMAKE_LFLAGS_THREAD	= -L/usr/lib/threads
 QMAKE_AIX_SHLIB		= 1
 
-QMAKE_LIBS		=
+QMAKE_LIBS		= -lc
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm -lbind
 QMAKE_LIBS_X11SM	= -lICE -lSM
@@ -74,8 +68,8 @@
 QMAKE_MOC		= $(QTDIR)/bin/moc
 QMAKE_UIC		= $(QTDIR)/bin/uic
 
-QMAKE_AR		= ar cq
-QMAKE_RANLIB		= ranlib
+QMAKE_AR		= ar cqs
+QMAKE_RANLIB		=
 
 QMAKE_TAR		= tar -cf
 QMAKE_GZIP		= gzip -9f
--- qmake/generators/unix/unixmake2.cpp.orig	Mon Mar 18 09:45:59 2002
+++ qmake/generators/unix/unixmake2.cpp	Wed Mar 27 19:19:47 2002
@@ -125,7 +125,7 @@
     t << "RANLIB   = " << var("QMAKE_RANLIB") << endl;
     t << "MOC      = " << var("QMAKE_MOC") << endl;
     t << "UIC      = "	<< var("QMAKE_UIC") << endl;
-    t << "QMAKE    = "	<< (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") : var("QMAKE_QMAKE")) << endl;
+    t << "QMAKE    = "	<< (project->isEmpty("QMAKE_QMAKE") ? QString("$(QTDIR)/bin/qmake") : var("QMAKE_QMAKE")) << endl;
     t << "TAR      = "	<< var("QMAKE_TAR") << endl;
     t << "GZIP     = " << var("QMAKE_GZIP") << endl;
     t << "COPY     = " << var("QMAKE_COPY") << endl;
@@ -475,6 +475,18 @@
 	    if(!project->isEmpty("QMAKE_POST_LINK"))
 		t << "\n\t" << var("QMAKE_POST_LINK") << "\n\t";
 	    t << endl << endl;
+	} else if(!project->variables()["QMAKE_AIX_SHLIB"].isEmpty()) {
+	    t << "\n\t"
+	      << "-rm -f $(TARGET) $(TARGET0)" << "\n\t"
+	      << var("QMAKE_LINK_SHLIB_CMD") << "\n\t"
+	      << "-$(AR) $(TARGET0) $(TARGET)";
+	    if(!destdir.isEmpty())
+	        t << "\n\t"
+	          << "-rm -f " << var("DESTDIR") << "$(TARGET0)\n\t"
+	          << "-mv $(TARGET0) " << var("DESTDIR");
+	    if(!project->isEmpty("QMAKE_POST_LINK"))
+	        t << "\n\t" << var("QMAKE_POST_LINK");
+	    t << endl << endl;
 	} else if(project->variables()["QMAKE_HPUX_SHLIB"].isEmpty()) {
 	    t << "\n\t"
 	      << "-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)" << "\n\t"
@@ -811,16 +823,7 @@
 	    project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
 						    project->first("QMAKE_EXTENSION_SHLIB") +
 						    "." + project->first("VER_MAJ"));
-	    project->variables()["TARGET_x.y"].append("lib" + project->first("TARGET") + "." +
-						      project->first("QMAKE_EXTENSION_SHLIB")
-						      + "." + project->first("VER_MAJ") +
-						      "." + project->first("VER_MIN"));
-	    project->variables()["TARGET_x.y.z"].append("lib" + project->first("TARGET") + "." +
-							project->first("QMAKE_EXTENSION_SHLIB") + "." +
-							project->first("VER_MAJ") + "." +
-							project->first("VER_MIN") + "." +
-							project->first("VER_PAT"));
-	    project->variables()["TARGET"] = project->variables()["TARGET_x.y.z"];
+	    project->variables()["TARGET"] = project->variables()["TARGET_x"];
 	} else {
 	    project->variables()["TARGET_"].append("lib" + project->first("TARGET") + "." +
 						   project->first("QMAKE_EXTENSION_SHLIB"));
--- qmake/generators/unix/unixmake.cpp.orig	Mon Mar 18 09:45:59 2002
+++ qmake/generators/unix/unixmake.cpp	Wed Mar 27 19:19:47 2002
@@ -369,6 +369,8 @@
 	    if(project->isActiveConfig("plugin")) {
 	    } else if ( !project->isEmpty("QMAKE_HPUX_SHLIB") ) {
 		links << "$(TARGET0)";
+	    } else if ( !project->isEmpty("QMAKE_AIX_SHLIB") ) {
+		target = "$(TARGET0)";
 	    }else
 		links << "$(TARGET0)" << "$(TARGET1)" << "$(TARGET2)";
 	}
--- configure.orig	Sun Mar 10 10:59:59 2002
+++ configure	Wed Mar 27 19:19:47 2002
@@ -657,10 +657,8 @@
 #   and Ctrl+C results in SIGINT which on Linux is 2
 if [ "$MAC_PLATFORM" = "no" ]
 then
-trap "\
-[ -r qconfig.h-hold ] && mv -f $outpath/qconfig.h-hold $outpath/include/qconfig.h ;\
-[ -r qmodules.h-hold ] && mv -f $outpath/qmodules.h-hold $outpath/include/qmodules.h ;\
-exit 130" HUP INT TERM
+[ -r qconfig.h-hold ] && mv -f $outpath/qconfig.h-hold $outpath/include/qconfig.h
+[ -r qmodules.h-hold ] && mv -f $outpath/qmodules.h-hold $outpath/include/qmodules.h
 fi
 
 # is this a shadow build?