--- solaris-g++/qmake.conf.orig	Fri Jan 28 19:08:54 2011
+++ solaris-g++/qmake.conf	Thu Feb 10 19:09:24 2011
@@ -28,7 +28,7 @@
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_STATIC_LIB	= $$QMAKE_CFLAGS_SHLIB
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-QMAKE_CFLAGS_THREAD	= -D_REENTRANT
+QMAKE_CFLAGS_THREAD	= -pthreads -D_REENTRANT
 
 QMAKE_CXX		= g++
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
@@ -42,12 +42,12 @@
 QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
 QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
-QMAKE_INCDIR		= /usr/sfw/include
-QMAKE_LIBDIR		= /usr/sfw/lib
+QMAKE_INCDIR		= /usr/g++/include
+QMAKE_LIBDIR		= /usr/g++/lib
 QMAKE_INCDIR_X11	= /usr/openwin/include
 QMAKE_LIBDIR_X11	= /usr/openwin/lib
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
+QMAKE_INCDIR_QT		= /usr/g++/include/qt
+QMAKE_LIBDIR_QT		= /usr/g++/lib
 QMAKE_INCDIR_OPENGL	= /usr/openwin/include
 QMAKE_LIBDIR_OPENGL	= /usr/openwin/lib