Skip to content

Commit

Permalink
packaging updates after helpviewer removal (followup 55cdc89)
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Aug 17, 2017
1 parent a7cef87 commit e325895
Show file tree
Hide file tree
Showing 8 changed files with 3 additions and 31 deletions.
3 changes: 2 additions & 1 deletion debian/libqgis-dev.install.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ usr/lib/libqgis_app.so
usr/lib/libqgis_core.so
usr/lib/libqgis_gui.so
usr/lib/libqgis_analysis.so
#server#usr/lib/libqgis_server.so
usr/lib/libqgis_native.so
usr/lib/libqgis_server.so
usr/lib/libqgisgrass{GRASSVER}.so
usr/lib/libqgispython.so
usr/share/qgis/FindQGIS.cmake
1 change: 1 addition & 0 deletions debian/qgis-common.install
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ usr/share/qgis/doc/images
usr/share/qgis/doc/index.html
usr/share/qgis/doc/news
usr/share/qgis/doc/news.html
usr/share/qgis/doc/nohelp.html
usr/share/qgis/doc/style.css
usr/share/qgis/i18n/*
usr/share/qgis/images/*
Expand Down
1 change: 0 additions & 1 deletion debian/qgis.install
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ usr/lib/qgis/plugins/libspatialqueryplugin.so
usr/lib/qgis/plugins/libofflineeditingplugin.so
usr/lib/qgis/plugins/libtopolplugin.so
usr/lib/qgis/plugins/libgeometrycheckerplugin.so
usr/lib/qgis/qgis_help
usr/share/pixmaps/
usr/share/applications/
usr/share/mime/packages/
Expand Down
4 changes: 0 additions & 4 deletions debian/qgis.lintian-overrides

This file was deleted.

1 change: 0 additions & 1 deletion ms-windows/osgeo4w/package.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,6 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%/%PACKAGENAME%-%VERS
"apps/%PACKAGENAME%/plugins/spatialqueryplugin.dll" ^
"apps/%PACKAGENAME%/plugins/topolplugin.dll" ^
"apps/%PACKAGENAME%/plugins/geometrycheckerplugin.dll" ^
"apps/%PACKAGENAME%/qgis_help.exe" ^
"apps/%PACKAGENAME%/qtplugins/sqldrivers/qsqlspatialite.dll" ^
"apps/%PACKAGENAME%/qtplugins/designer/" ^
"apps/%PACKAGENAME%/python/" ^
Expand Down
6 changes: 0 additions & 6 deletions python/core/qgsapplication.sip
Original file line number Diff line number Diff line change
Expand Up @@ -223,12 +223,6 @@ Returns the path to the licence file.
:rtype: str
%End

static QString helpAppPath();
%Docstring
Returns the path to the help application.
:rtype: str
%End

static QString i18nPath();
%Docstring
Returns the path to the translation directory.
Expand Down
15 changes: 0 additions & 15 deletions src/core/qgsapplication.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -614,21 +614,6 @@ QString QgsApplication::licenceFilePath()
return ABISYM( mPkgDataPath ) + QStringLiteral( "/doc/LICENSE" );
}

QString QgsApplication::helpAppPath()
{
QString helpAppPath;
#ifdef Q_OS_MACX
helpAppPath = applicationDirPath() + "/bin/qgis_help.app/Contents/MacOS";
#else
helpAppPath = libexecPath();
#endif
helpAppPath += QLatin1String( "/qgis_help" );
#ifdef Q_OS_WIN
helpAppPath += ".exe";
#endif
return helpAppPath;
}

QString QgsApplication::i18nPath()
{
if ( ABISYM( mRunningFromBuildDir ) )
Expand Down
3 changes: 0 additions & 3 deletions src/core/qgsapplication.h
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,6 @@ class CORE_EXPORT QgsApplication : public QApplication
*/
static QString licenceFilePath();

//! Returns the path to the help application.
static QString helpAppPath();

//! Returns the path to the translation directory.
static QString i18nPath();

Expand Down

0 comments on commit e325895

Please sign in to comment.