Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix references to contributors.json #7722

Merged
merged 1 commit into from
Aug 27, 2018
Merged

Fix references to contributors.json #7722

merged 1 commit into from
Aug 27, 2018

Conversation

nirvn
Copy link
Contributor

@nirvn nirvn commented Aug 27, 2018

Description

@timlinux , a couple of cleanups following your new Easter eggs. Feel free to merge at will.

Checklist

Reviewing is a process done by project maintainers, mostly on a volunteer basis. We try to keep the overhead as small as possible and appreciate if you help us to do so by completing the following items. Feel free to ask in a comment if you have troubles with any of them.

  • Commit messages are descriptive and explain the rationale for changes
  • Commits which fix bugs include fixes #11111 in the commit message next to the description
  • Commits which add new features are tagged with [FEATURE] in the commit message
  • Commits which change the UI or existing user workflows are tagged with [needs-docs] in the commit message and contain sufficient information in the commit message to be documented
  • I have read the QGIS Coding Standards and this PR complies with them
  • This PR passes all existing unit tests (test results will be reported by travis-ci after opening this PR)
  • New unit tests have been added for core changes
  • I have run the scripts/prepare-commit.sh script before each commit

@@ -231,7 +231,7 @@ class CORE_EXPORT QgsApplication : public QApplication
/**
* Returns the path to the developers map file.
* The developers map was created by using leaflet framework,
* it shows the doc/contributors.json file.
* it shows the contributors.json file.
* \since QGIS 2.7 */
static QString developersMapFilePath();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nirvn thanks so much for your fixes. Can you update the implementation for developerMapFilePath to find the file in resources/data e.g.:

QString fileName = QgsApplication::pkgDataPath() + QStringLiteral( "/resources/data/contributors.json" );

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK sorry I see there is more to fix on that - hold on that I will fix it here...sorry for the noise

@timlinux timlinux merged commit f1fdbbb into qgis:master Aug 27, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants