2 files changed, 14 insertions, 7 deletions

diff --git a/mkspecs/solaris-cc/qmake.conf b/mkspecs/solaris-cc/qmake.conf
index bee60c9..d1f080e 100644
--- a/mkspecs/solaris-cc/qmake.conf
+++ b/mkspecs/solaris-cc/qmake.conf
@@ -1,22 +1,23 @@
 #
 # $Id$
 #
-# qmake configuration for Sun WorkShop 5.0, Forte Developer 6,
-        #                               and Sun ONE Studio 7 on Solaris
+# qmake configuration for solaris-cc
+#
+# Written for Sun WorkShop 5.0, Forte Developer 6, and Sun ONE Studio 7.
 #
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = cc
         QMAKE_LEX       = flex
         QMAKE_LEXFLAGS  = 
         QMAKE_YACC      = yacc
         QMAKE_YACCFLAGS         = -d
         QMAKE_CFLAGS    = $(CFLAGS_EXTRA)
         QMAKE_CFLAGS_DEPS= -xM
         QMAKE_CFLAGS_WARN_ON=
         QMAKE_CFLAGS_WARN_OFF= -w
         QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O)
         QMAKE_CFLAGS_DEBUG= -g
@@ -55,29 +56,31 @@ QMAKE_LFLAGS_SONAME	= -h$$LITERAL_WHITESPACE
         QMAKE_LFLAGS_THREAD= -mt
         QMAKE_RPATH     = -R
 
         QMAKE_LIBS      = $(LIBS_EXTRA)
         QMAKE_LIBS_DYNLOAD= -ldl
         QMAKE_LIBS_X11  = -lXext -lX11 -lresolv -lsocket -lnsl
         QMAKE_LIBS_X11SM= -lSM -lICE
         QMAKE_LIBS_NIS  =
         QMAKE_LIBS_QT   = -lqt
         QMAKE_LIBS_QT_THREAD= -lqt-mt
         QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
         QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
-        QMAKE_LIBS_THREAD= -lpthread
+        QMAKE_LIBS_THREAD= -lpthread -lrt
 
         QMAKE_MOC       = $(QTDIR)/bin/moc
         QMAKE_UIC       = $(QTDIR)/bin/uic
 
         QMAKE_AR        = CC -xar -o
         QMAKE_RANLIB    =
 
         QMAKE_CLEAN     = -r $(OBJECTS_DIR)Templates.DB $(OBJECTS_DIR)SunWS_cache
 
         QMAKE_TAR       = tar -cf
         QMAKE_GZIP      = gzip -9f
 
         QMAKE_COPY      = cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/solaris-cc/qplatformdefs.h b/mkspecs/solaris-cc/qplatformdefs.h
index f9480a9..9506b3c 100644
--- a/mkspecs/solaris-cc/qplatformdefs.h
+++ b/mkspecs/solaris-cc/qplatformdefs.h
@@ -1,20 +1,21 @@
 #ifndef QPLATFORMDEFS_H
 #define QPLATFORMDEFS_H
 
 // Get Qt defines/settings
 
 #include "qglobal.h"
 
 // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+#define _POSIX_PTHREAD_SEMANTICS
 
 #include <unistd.h>
 
 
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
 #ifdef QT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
 #include <dirent.h>
@@ -68,31 +69,34 @@
         #define QT_OPEN_WRONLY  O_WRONLY
         #define QT_OPEN_RDWR    O_RDWR
         #define QT_OPEN_CREAT   O_CREAT
         #define QT_OPEN_TRUNC   O_TRUNC
         #define QT_OPEN_APPEND  O_APPEND
 #endif
 
         #define QT_SIGNAL_RETTYPEvoid
         #define QT_SIGNAL_ARGS  int
         #define QT_SIGNAL_IGNORESIG_IGN
 
 #if !defined(_XOPEN_UNIX)
-// Function usleep() is in C library but not in header files on Solaris 2.5.1.
-// Not really a surprise, usleep() is specified by XPG4v2 and XPG4v2 is only
-// supported by Solaris 2.6 and better.
+// Function usleep() is defined in C library but not declared in header files
+// on Solaris 2.5.1. Not really a surprise, usleep() is specified by XPG4v2
+// and XPG4v2 is only supported by Solaris 2.6 and better.
+// Function gethostname() is defined in C library but not declared in <unistd.h>
+// on Solaris 2.5.1.
 // So we are trying to detect Solaris 2.5.1 using macro _XOPEN_UNIX which is
 // not defined by <unistd.h> when XPG4v2 is not supported.
 typedef unsigned int useconds_t;
 extern "C" int usleep(useconds_t);
+extern "C" int gethostname(char *, int);
 #endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500) && (_XOPEN_VERSION-0 >= 500)
 // on Solaris 7 and better with specific feature test macros
         #define QT_SOCKLEN_T    socklen_t
 #elif defined(_XOPEN_SOURCE_EXTENDED) && (_XOPEN_VERSION-0 >= 4)
 // on Solaris 2.6 and better with specific feature test macros
         #define QT_SOCKLEN_T    size_t
 #else
 // always this case in practice
         #define QT_SOCKLEN_T    int
 #endif