Skip to content

Commit 9c00584

Browse files
author
jef
committed
fix #2294
git-svn-id: http://svn.osgeo.org/qgis/trunk@12622 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 4099c4a commit 9c00584

File tree

3 files changed

+7
-13
lines changed

3 files changed

+7
-13
lines changed

src/core/qgsapplication.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,6 @@ const QString QgsApplication::developerPath()
225225
const QString QgsApplication::helpAppPath()
226226
{
227227
QString helpAppPath = applicationDirPath();
228-
#ifdef Q_OS_MACX
229-
helpAppPath += "/bin/qgis_help.app/Contents/MacOS";
230-
#endif
231228
helpAppPath += "/qgis_help";
232229
return helpAppPath;
233230
}

src/helpviewer/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ QT4_WRAP_CPP (HELP_MOC_SRCS ${HELP_MOC_HDRS})
5454

5555
#QT4_ADD_RESOURCES(HELP_RCC_SRCS ${HELP_RCCS})
5656

57-
ADD_EXECUTABLE (qgis_help MACOSX_BUNDLE ${HELP_SRCS} ${HELP_MOC_SRCS} ${HELP_UIS_H})
57+
ADD_EXECUTABLE (qgis_help ${HELP_SRCS} ${HELP_MOC_SRCS} ${HELP_UIS_H})
5858

5959
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
6060
${CMAKE_CURRENT_SOURCE_DIR}/../core
@@ -97,8 +97,8 @@ SET_TARGET_PROPERTIES(qgis_help PROPERTIES
9797
########################################################
9898
# Install
9999

100-
IF (APPLE AND NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS "2.6")
101-
INSTALL (TARGETS qgis_help BUNDLE DESTINATION ${QGIS_BIN_DIR})
102-
ELSE (APPLE AND NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS "2.6")
100+
IF (APPLE)
101+
INSTALL (TARGETS qgis_help RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
102+
ELSE (APPLE)
103103
INSTALL (TARGETS qgis_help RUNTIME DESTINATION ${QGIS_BIN_DIR})
104-
ENDIF (APPLE AND NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS "2.6")
104+
ENDIF (APPLE)

src/helpviewer/main.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* (at your option) any later version. *
1616
* *
1717
***************************************************************************/
18+
#include <iostream>
1819
#include <QLocale>
1920
#include <QSettings>
2021
#include <QTranslator>
@@ -40,10 +41,6 @@ int main( int argc, char ** argv )
4041
{
4142
context = argv[1];
4243
}
43-
#ifdef Q_WS_MACX
44-
// If we're on Mac, we have the resource library way above us...
45-
a.setPkgDataPath( QgsApplication::prefixPath() + "/../../../../" + QString( QGIS_DATA_SUBDIR ) );
46-
#endif
4744

4845
QString i18nPath = QgsApplication::i18nPath();
4946
if ( myTranslationCode.isEmpty() )
@@ -87,7 +84,7 @@ int main( int argc, char ** argv )
8784
// an additional viewer if one is already running.
8885
QgsHelpContextServer *helpServer = new QgsHelpContextServer();
8986
// Make port number available to client
90-
QgsDebugMsg( helpServer->serverPort() );
87+
std::cout << helpServer->serverPort() << std::endl;
9188
// Pass context request from socket to viewer widget
9289
QObject::connect( helpServer, SIGNAL( setContext( const QString& ) ),
9390
&w, SLOT( setContext( const QString& ) ) );

0 commit comments

Comments
 (0)