fix #2294

git-svn-id: http://svn.osgeo.org/qgis/trunk@12622 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Dec 27, 2009 · 9c005844491d8ce96da363b2bda70113bdbecfa3 · 9c00584
1 parent 4099c4a
commit 9c005844491d8ce96da363b2bda70113bdbecfa3
Showing with 7 additions and 13 deletions.

+0 −3 src/core/qgsapplication.cpp

+5 −5 src/helpviewer/CMakeLists.txt

+2 −5 src/helpviewer/main.cpp
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -225,9 +225,6 @@ const QString QgsApplication::developerPath()
 const QString QgsApplication::helpAppPath()
 {
   QString helpAppPath = applicationDirPath();
-#ifdef Q_OS_MACX
-  helpAppPath += "/bin/qgis_help.app/Contents/MacOS";
-#endif
   helpAppPath += "/qgis_help";
   return helpAppPath;
 }

diff --git a/src/helpviewer/CMakeLists.txt b/src/helpviewer/CMakeLists.txt
@@ -54,7 +54,7 @@ QT4_WRAP_CPP (HELP_MOC_SRCS  ${HELP_MOC_HDRS})
 
 #QT4_ADD_RESOURCES(HELP_RCC_SRCS ${HELP_RCCS})
 
-ADD_EXECUTABLE (qgis_help MACOSX_BUNDLE ${HELP_SRCS} ${HELP_MOC_SRCS} ${HELP_UIS_H})
+ADD_EXECUTABLE (qgis_help ${HELP_SRCS} ${HELP_MOC_SRCS} ${HELP_UIS_H})
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
      ${CMAKE_CURRENT_SOURCE_DIR}/../core
@@ -97,8 +97,8 @@ SET_TARGET_PROPERTIES(qgis_help PROPERTIES
 ########################################################
 # Install
 
-IF (APPLE AND NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS "2.6")
-  INSTALL (TARGETS qgis_help BUNDLE DESTINATION ${QGIS_BIN_DIR})
-ELSE (APPLE AND NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS "2.6")
+IF (APPLE)
+  INSTALL (TARGETS qgis_help RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
+ELSE (APPLE)
   INSTALL (TARGETS qgis_help RUNTIME DESTINATION ${QGIS_BIN_DIR})
-ENDIF (APPLE AND NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS "2.6")
+ENDIF (APPLE)
diff --git a/src/helpviewer/main.cpp b/src/helpviewer/main.cpp
@@ -15,6 +15,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
+#include <iostream>
 #include <QLocale>
 #include <QSettings>
 #include <QTranslator>
@@ -40,10 +41,6 @@ int main( int argc, char ** argv )
   {
     context = argv[1];
   }
-#ifdef Q_WS_MACX
-  // If we're on Mac, we have the resource library way above us...
-  a.setPkgDataPath( QgsApplication::prefixPath() + "/../../../../" + QString( QGIS_DATA_SUBDIR ) );
-#endif
 
   QString i18nPath = QgsApplication::i18nPath();
   if ( myTranslationCode.isEmpty() )
@@ -87,7 +84,7 @@ int main( int argc, char ** argv )
   // an additional viewer if one is already running.
   QgsHelpContextServer *helpServer = new QgsHelpContextServer();
   // Make port number available to client
-  QgsDebugMsg( helpServer->serverPort() );
+  std::cout << helpServer->serverPort() << std::endl;
   // Pass context request from socket to viewer widget
   QObject::connect( helpServer, SIGNAL( setContext( const QString& ) ),
                     &w, SLOT( setContext( const QString& ) ) );