File tree Expand file tree Collapse file tree 3 files changed +7
-13
lines changed Expand file tree Collapse file tree 3 files changed +7
-13
lines changed Original file line number Diff line number Diff line change @@ -225,9 +225,6 @@ const QString QgsApplication::developerPath()
225
225
const QString QgsApplication::helpAppPath ()
226
226
{
227
227
QString helpAppPath = applicationDirPath ();
228
- #ifdef Q_OS_MACX
229
- helpAppPath += " /bin/qgis_help.app/Contents/MacOS" ;
230
- #endif
231
228
helpAppPath += " /qgis_help" ;
232
229
return helpAppPath;
233
230
}
Original file line number Diff line number Diff line change @@ -54,7 +54,7 @@ QT4_WRAP_CPP (HELP_MOC_SRCS ${HELP_MOC_HDRS})
54
54
55
55
#QT4_ADD_RESOURCES(HELP_RCC_SRCS ${HELP_RCCS})
56
56
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} )
58
58
59
59
INCLUDE_DIRECTORIES (${CMAKE_CURRENT_SOURCE_DIR}
60
60
${CMAKE_CURRENT_SOURCE_DIR} /../core
@@ -97,8 +97,8 @@ SET_TARGET_PROPERTIES(qgis_help PROPERTIES
97
97
########################################################
98
98
# Install
99
99
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 )
103
103
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 )
Original file line number Diff line number Diff line change 15
15
* (at your option) any later version. *
16
16
* *
17
17
***************************************************************************/
18
+ #include < iostream>
18
19
#include < QLocale>
19
20
#include < QSettings>
20
21
#include < QTranslator>
@@ -40,10 +41,6 @@ int main( int argc, char ** argv )
40
41
{
41
42
context = argv[1 ];
42
43
}
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
47
44
48
45
QString i18nPath = QgsApplication::i18nPath ();
49
46
if ( myTranslationCode.isEmpty () )
@@ -87,7 +84,7 @@ int main( int argc, char ** argv )
87
84
// an additional viewer if one is already running.
88
85
QgsHelpContextServer *helpServer = new QgsHelpContextServer ();
89
86
// Make port number available to client
90
- QgsDebugMsg ( helpServer->serverPort () ) ;
87
+ std::cout << helpServer->serverPort () << std::endl ;
91
88
// Pass context request from socket to viewer widget
92
89
QObject::connect ( helpServer, SIGNAL ( setContext ( const QString& ) ),
93
90
&w, SLOT ( setContext ( const QString& ) ) );
You can’t perform that action at this time.
0 commit comments