diff --git a/bin/buildParaView b/bin/buildParaView
index e7c6c6f9b06cff8b88a2ff59ca0ab1e437666957..622169e012f46e1867208913ad432385f637bb04 100755
--- a/bin/buildParaView
+++ b/bin/buildParaView
@@ -58,8 +58,6 @@ withQTSUPPORT=true
 
 # Set the path to the Qt-4.3.? qmake if the system Qt is other than this version
 QMAKE_PATH=""
-#QMAKE_PATH=/usr/local/Trolltech/Qt-4.3.5/bin/qmake
-#QMAKE_PATH=$WM_THIRD_PARTY_DIR/qt-x11-opensource-src-4.3.5/platforms/linux64GccDPOpt/bin/qmake
 
 #
 # No further editing below this line
@@ -184,6 +182,11 @@ do
         withQTSUPPORT=true
         shift
         ;;
+    -qmake)
+        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+        export QMAKE_PATH=$2
+        shift 2
+        ;;
     -verbose)
         withVERBOSE=true
         shift
diff --git a/bin/tools/buildParaViewFunctions b/bin/tools/buildParaViewFunctions
index f0873998af6afc87ef71df7ff6fcefc808f87454..ff37e259b5f0d38b76fe98440a4bb850b993e38e 100644
--- a/bin/tools/buildParaViewFunctions
+++ b/bin/tools/buildParaViewFunctions
@@ -171,10 +171,13 @@ addQtSupport()
 
     addCMakeVariable "PARAVIEW_BUILD_QT_GUI=ON"
 
+    qmakeExe=qmake
+
     if [ -n "$QMAKE_PATH" ]
     then
         if [ -x "$QMAKE_PATH" ]
         then
+            qmakeExe=$QMAKE_PATH
             addCMakeVariable QT_QMAKE_EXECUTABLE:FILEPATH=$QMAKE_PATH
         else
             echo
@@ -184,6 +187,28 @@ addQtSupport()
             echo
         fi
     fi
+
+    # Check qmake can be found
+    if [ `which $qmakeExe` ]
+    then
+        # Check the Qt version selected
+        QtVersion=`$qmakeExe -v | grep Using | sed "s/.* version \(.\..\).*/\1/"`
+        QtMajor=`echo $QtVersion | sed "s/\(.\)\../\1/"`
+        QtMinor=`echo $QtVersion | sed "s/.\.\(.\)/\1/"`
+
+        if [ $QtMajor -lt 4 -o $QtMinor -lt 3 ]
+        then
+            echo "*** Error: Qt version provided < 4.3"
+            echo "***     Please use the -qmake option to specify the location of a version of Qt >= 4.3 "
+            echo "***     e.g."
+            echo "***         -qmake /usr/local/Trolltech/Qt-4.3.5/bin/qmake"
+            echo "***         -qmake $WM_THIRD_PARTY_DIR/qt-x11-opensource-src-4.3.5/platforms/$WM_OPTIONS/bin/qmake"
+            exit 1
+        fi
+    else
+        echo "*** Error: cannot find qmake either at \$QMAKE_PATH or in current \$PATH"
+        exit 1
+    fi
 }