Skip to content
Permalink
Browse files

Merge pull request #4585 from alexbruy/sponsors-2_18

open sponsors page in the webbrowser (fix #16169)
  • Loading branch information
alexbruy committed May 18, 2017
2 parents e6f6406 + f29a267 commit 08ffb73b2614970bc412409c28fa2c0044ab63bc
Showing with 3 additions and 360 deletions.
  1. +1 −1 doc/CMakeLists.txt
  2. +0 −139 doc/release-sponsors.html
  3. +1 −3 src/app/CMakeLists.txt
  4. +1 −5 src/app/qgisapp.cpp
  5. +0 −71 src/app/qgssponsors.cpp
  6. +0 −35 src/app/qgssponsors.h
  7. +0 −106 src/ui/qgssponsorsbase.ui
@@ -22,7 +22,7 @@ ELSE(TXT2TAGS_EXECUTABLE)
)
ENDIF(TXT2TAGS_EXECUTABLE)

SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html news.html developersmap.html contributors.json favicon.ico style.css release-sponsors.html AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS LICENSE)
SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html news.html developersmap.html contributors.json favicon.ico style.css AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS LICENSE)

INSTALL(FILES ${QGIS_DOC_FILES} DESTINATION ${QGIS_DATA_DIR}/doc)
INSTALL(FILES ../images/icons/qgis-icon-60x60.png DESTINATION ${QGIS_DATA_DIR}/doc/images)

This file was deleted.

@@ -7,7 +7,6 @@ SET(QGIS_APP_SRCS
qgsabout.cpp
qgsalignrasterdialog.cpp
qgsapplayertreeviewmenuprovider.cpp
qgssponsors.cpp
qgsaddattrdialog.cpp
qgsaddtaborgroup.cpp
qgsjoindialog.cpp
@@ -296,7 +295,6 @@ SET (QGIS_APP_MOC_HDRS
qgsrelationadddlg.h
qgsselectbyformdialog.h
qgssnappingdialog.h
qgssponsors.h
qgsstatisticalsummarydockwidget.h
qgssubstitutionlistwidget.h
qgssvgannotationdialog.h
@@ -520,7 +518,7 @@ IF(PEDANTIC)
SET_SOURCE_FILES_PROPERTIES(
qgisappinterface.cpp
${CMAKE_BINARY_DIR}/src/app/moc_qgisappinterface.cxx
PROPERTIES COMPILE_FLAGS "/wd4996"
PROPERTIES COMPILE_FLAGS "/wd4996"
)
ELSE(MSVC)
SET_SOURCE_FILES_PROPERTIES(
@@ -215,7 +215,6 @@
#include "qgssinglebandgrayrenderer.h"
#include "qgssnappingdialog.h"
#include "qgssourceselectdialog.h"
#include "qgssponsors.h"
#include "qgsstatisticalsummarydockwidget.h"
#include "qgsstatusbarcoordinateswidget.h"
#include "qgsstatusbarmagnifierwidget.h"
@@ -3402,10 +3401,7 @@ void QgisApp::restoreWindowState()
///////////// END OF GUI SETUP ROUTINES ///////////////
void QgisApp::sponsors()
{
QgsSponsors * sponsors = new QgsSponsors( this );
sponsors->show();
sponsors->raise();
sponsors->activateWindow();
openURL( tr( "http://qgis.org/en/site/about/sponsorship.html" ), false );
}

void QgisApp::about()

This file was deleted.

This file was deleted.

0 comments on commit 08ffb73

Please sign in to comment.