Skip to content

Commit 08ffb73

Browse files
authoredMay 18, 2017
Merge pull request #4585 from alexbruy/sponsors-2_18
open sponsors page in the webbrowser (fix #16169)
2 parents e6f6406 + f29a267 commit 08ffb73

File tree

7 files changed

+3
-360
lines changed

7 files changed

+3
-360
lines changed
 

‎doc/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ELSE(TXT2TAGS_EXECUTABLE)
2222
)
2323
ENDIF(TXT2TAGS_EXECUTABLE)
2424

25-
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)
25+
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)
2626

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

‎doc/release-sponsors.html

Lines changed: 0 additions & 139 deletions
This file was deleted.

‎src/app/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ SET(QGIS_APP_SRCS
77
qgsabout.cpp
88
qgsalignrasterdialog.cpp
99
qgsapplayertreeviewmenuprovider.cpp
10-
qgssponsors.cpp
1110
qgsaddattrdialog.cpp
1211
qgsaddtaborgroup.cpp
1312
qgsjoindialog.cpp
@@ -296,7 +295,6 @@ SET (QGIS_APP_MOC_HDRS
296295
qgsrelationadddlg.h
297296
qgsselectbyformdialog.h
298297
qgssnappingdialog.h
299-
qgssponsors.h
300298
qgsstatisticalsummarydockwidget.h
301299
qgssubstitutionlistwidget.h
302300
qgssvgannotationdialog.h
@@ -520,7 +518,7 @@ IF(PEDANTIC)
520518
SET_SOURCE_FILES_PROPERTIES(
521519
qgisappinterface.cpp
522520
${CMAKE_BINARY_DIR}/src/app/moc_qgisappinterface.cxx
523-
PROPERTIES COMPILE_FLAGS "/wd4996"
521+
PROPERTIES COMPILE_FLAGS "/wd4996"
524522
)
525523
ELSE(MSVC)
526524
SET_SOURCE_FILES_PROPERTIES(

‎src/app/qgisapp.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,6 @@
215215
#include "qgssinglebandgrayrenderer.h"
216216
#include "qgssnappingdialog.h"
217217
#include "qgssourceselectdialog.h"
218-
#include "qgssponsors.h"
219218
#include "qgsstatisticalsummarydockwidget.h"
220219
#include "qgsstatusbarcoordinateswidget.h"
221220
#include "qgsstatusbarmagnifierwidget.h"
@@ -3402,10 +3401,7 @@ void QgisApp::restoreWindowState()
34023401
///////////// END OF GUI SETUP ROUTINES ///////////////
34033402
void QgisApp::sponsors()
34043403
{
3405-
QgsSponsors * sponsors = new QgsSponsors( this );
3406-
sponsors->show();
3407-
sponsors->raise();
3408-
sponsors->activateWindow();
3404+
openURL( tr( "http://qgis.org/en/site/about/sponsorship.html" ), false );
34093405
}
34103406

34113407
void QgisApp::about()

‎src/app/qgssponsors.cpp

Lines changed: 0 additions & 71 deletions
This file was deleted.

‎src/app/qgssponsors.h

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎src/ui/qgssponsorsbase.ui

Lines changed: 0 additions & 106 deletions
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.