From 8c61ab8fb0ef21bba8747fcdc358fd5f9cb0bf5b Mon Sep 17 00:00:00 2001
From: rti <devnull@localhost>
Date: Sun, 14 Nov 2010 15:59:32 +0100
Subject: [PATCH] Changed: #1190 build app bundle and use QWidget instead of
 QGLWidget

---
 .../tools/leveldesign/georges_editor_qt/src/CMakeLists.txt    | 4 ++--
 .../leveldesign/georges_editor_qt/src/objectviewer_dialog.cpp | 4 ++--
 .../leveldesign/georges_editor_qt/src/objectviewer_dialog.h   | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/CMakeLists.txt b/code/ryzom/tools/leveldesign/georges_editor_qt/src/CMakeLists.txt
index 11f3314ae..49792c02e 100644
--- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/CMakeLists.txt
@@ -14,7 +14,7 @@ QT4_ADD_RESOURCES( GEORGES_EDITOR_RC_SRCS ${GEORGES_EDITOR_RCS} )
 QT4_WRAP_CPP( GEORGES_EDITOR_MOC_SRCS ${GEORGES_EDITOR_HDR} )
 QT4_WRAP_UI( GEORGES_EDITOR_UI_HDRS ${GEORGES_EDITOR_UIS} )
 
-ADD_EXECUTABLE(georges_editor_qt WIN32 ${GEORGES_EDITOR_SRC} ${GEORGES_EDITOR_MOC_SRCS} ${GEORGES_EDITOR_RC_SRCS} ${GEORGES_EDITOR_UI_HDRS})
+ADD_EXECUTABLE(georges_editor_qt WIN32 MACOSX_BUNDLE ${GEORGES_EDITOR_SRC} ${GEORGES_EDITOR_MOC_SRCS} ${GEORGES_EDITOR_RC_SRCS} ${GEORGES_EDITOR_UI_HDRS})
 
 TARGET_LINK_LIBRARIES(georges_editor_qt
 		nelmisc 
@@ -32,4 +32,4 @@ IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(georges_editor_qt ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
 ENDIF(WITH_PCH)
 
-INSTALL(TARGETS georges_editor_qt RUNTIME DESTINATION bin COMPONENT runtime)
+INSTALL(TARGETS georges_editor_qt RUNTIME DESTINATION bin COMPONENT runtime BUNDLE DESTINATION /Applications)
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.cpp
index 3137187d2..e45755ab1 100644
--- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.cpp
+++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.cpp
@@ -77,9 +77,9 @@ namespace NLQT
 		//H_AUTO2
 		nldebug("CObjectViewerDialog::init %d",_nlw->winId());
 
-#ifdef NL_OS_UNIX
+#if defined(NL_OS_UNIX) && !defined(NL_OS_MAC)
 		dynamic_cast<QNLWidget*>(widget())->makeCurrent();
-#endif // NL_OS_UNIX
+#endif // defined(NL_OS_UNIX) && !defined(NL_OS_MAC)
 
 		Modules::objView().init((nlWindow)_nlw->winId(), 20, 20);
 		setMouseTracking(true);
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.h b/code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.h
index 92c8724e8..7526210d5 100644
--- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.h
+++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.h
@@ -39,6 +39,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef NL_OS_WINDOWS
 //typedef QDockWidget QNLWidget;
 typedef QWidget QNLWidget;
+#elif defined(NL_OS_MAC)
+typedef QWidget QNLWidget;
 #else // NL_OS_UNIX
 typedef QGLWidget QNLWidget;
 #endif // NL_OS_UNIX