Spacescape Linux Build Patch

diff --git a/trunk/CMake/FindPkgMacros.cmake b/trunk/CMake/FindPkgMacros.cmake
index 0ca97dc..ec1f09d 100644
--- a/trunk/CMake/FindPkgMacros.cmake
+++ b/trunk/CMake/FindPkgMacros.cmake
@@ -71,8 +71,6 @@ endmacro (use_pkgconfig)
 macro(make_library_set PREFIX)
   if (${PREFIX}_FWK)
     set(${PREFIX} ${${PREFIX}_FWK})
-  elseif (${PREFIX}_REL AND ${PREFIX}_DBG)
-    set(${PREFIX} optimized ${${PREFIX}_REL} debug ${${PREFIX}_DBG})
   elseif (${PREFIX}_REL)
     set(${PREFIX} ${${PREFIX}_REL})
   elseif (${PREFIX}_DBG)

diff --git a/trunk/Spacescape/external/QtPropertyBrowser/CMakeLists.txt b/trunk/Spacescape/external/QtPropertyBrowser/CMakeLists.txt
index 78743e1..68f4e65 100644
--- a/trunk/Spacescape/external/QtPropertyBrowser/CMakeLists.txt
+++ b/trunk/Spacescape/external/QtPropertyBrowser/CMakeLists.txt
@@ -12,7 +12,7 @@ ELSEIF(WIN32)
    EXECUTE_PROCESS(COMMAND qmake qtpropertybrowser.pro WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
    EXECUTE_PROCESS(COMMAND vcvars32-nmake.bat WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} RESULT_VARIABLE ret_var OUTPUT_VARIABLE ret_val ERROR_VARIABLE ret_val )
 ENDIF(UNIX)
-FIND_LIBRARY(QtPropertyBrowser_Library_DBG NAMES QtSolutions_PropertyBrowser-2.5d PATHS lib/)
+FIND_LIBRARY(QtPropertyBrowser_Library_DBG NAMES QtSolutions_PropertyBrowser-2.5 PATHS lib/)
 FIND_LIBRARY(QtPropertyBrowser_Library_REL NAMES QtSolutions_PropertyBrowser-2.5 PATHS lib/)

 IF(NOT QtPropertyBrowser_Library_REL)
diff --git a/trunk/Spacescape/include/QtOgreWidget.h b/trunk/Spacescape/include/QtOgreWidget.h
index 29e9f1e..6948b3d 100644
--- a/trunk/Spacescape/include/QtOgreWidget.h
+++ b/trunk/Spacescape/include/QtOgreWidget.h
@@ -30,9 +30,6 @@ THE SOFTWARE.
 #ifndef QtOgreWidget_H
 #define QtOgreWidget_H

-#define Q_WS_MAC
-#define Q_WS_MAC32
-
 #include <QWidget>
 #if defined(Q_WS_WIN)
 // disable some warning
@@ -117,4 +114,4 @@ protected:
 #endif
 };

-#endif
\ No newline at end of file
+#endif
diff --git a/trunk/Spacescape/include/QtSpacescapeWidget.h b/trunk/Spacescape/include/QtSpacescapeWidget.h
index 24587ee..86bda09 100644
--- a/trunk/Spacescape/include/QtSpacescapeWidget.h
+++ b/trunk/Spacescape/include/QtSpacescapeWidget.h
@@ -30,11 +30,11 @@ THE SOFTWARE.
 #ifndef QtSpacescapeWidget_H
 #define QtSpacescapeWidget_H

-//#if defined(Q_WS_MAC)
+#if defined(Q_WS_MAC)
 #include "QtOgreWidgetOSX.h"
-//#else
-//#include "QtOgreWidget.h"
-//#endif
+#else
+#include "QtOgreWidget.h"
+#endif
 #include "SpacescapePlugin.h"
 #include "SpacescapeLayer.h"

diff --git a/trunk/Spacescape/src/QtOgreWidget.cpp b/trunk/Spacescape/src/QtOgreWidget.cpp
index e2c05ce..0948b37 100644
--- a/trunk/Spacescape/src/QtOgreWidget.cpp
+++ b/trunk/Spacescape/src/QtOgreWidget.cpp
@@ -42,7 +42,7 @@ Ogre::Root * QtOgreWidget::mOgreRoot = NULL;
 /** Constructor
 @param parent
 */
-QtOgreWidget::QtOgreWidget(QWidget *parent) : QWidget(parent) {
+QtOgreWidget::QtOgreWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent) {
    setAttribute(Qt::WA_PaintOnScreen);
    setAttribute(Qt::WA_NoBackground);