Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[Plugin Manager] Temporarily hardcode QGIS_VERSION=2.0.0 in the QgsPl…
…uginInstaller and QgsPluginRegistry to allow proper version comparision until it's globally set before the release.
  • Loading branch information
borysiasty committed Jun 9, 2013
1 parent 5c50e2a commit d004791
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 0 deletions.
11 changes: 11 additions & 0 deletions python/pyplugin_installer/installer.py
Expand Up @@ -34,6 +34,17 @@
from qgsplugininstallerrepositorydialog import QgsPluginInstallerRepositoryDialog


################################################################################
################################################################################
### TEMPORARY WORKAROUND UNTIL VERSION NUMBER IS GLOBALY SWITCHED TO 2.0 #######
################################################################################
class QGis: ##################################
QGIS_VERSION_INT = 20000 ##################################
QGIS_VERSION = '2.0.0-Master' ##################################
################################################################################
################################################################################


# public instances:
pluginInstaller = None

Expand Down
9 changes: 9 additions & 0 deletions python/pyplugin_installer/installer_data.py
Expand Up @@ -125,6 +125,15 @@



################################################################################
################################################################################
### TEMPORARY WORKAROUND UNTIL VERSION NUMBER IS GLOBALY SWITCHED TO 2.0 #######
################################################################################
class QGis: ##################################
QGIS_VERSION_INT = 20000 ##################################
QGIS_VERSION = '2.0.0-Master' ##################################
################################################################################
################################################################################


# --- common functions ------------------------------------------------------------------- #
Expand Down
10 changes: 10 additions & 0 deletions src/app/qgspluginregistry.cpp
Expand Up @@ -237,6 +237,16 @@ bool QgsPluginRegistry::checkQgisVersion( QString minVersion, QString maxVersion

// our qgis version - cut release name after version number
QString qgisVersion = QString( QGis::QGIS_VERSION ).section( '-', 0, 0 );

// /////////////////////////////////////////////////////////////////////////////
// TEMPORARY WORKAROUND UNTIL VERSION NUMBER IS GLOBALY SWITCHED TO 2.0 //
// /////////////////////////////////////////////////////////////////////////////
// //////////////////////////////////
qgisVersion = "2.0.0"; //////////////////////////////////
// //////////////////////////////////
// /////////////////////////////////////////////////////////////////////////////
// /////////////////////////////////////////////////////////////////////////////

QStringList qgisVersionParts = qgisVersion.split( "." );

int qgisMajor = qgisVersionParts.at( 0 ).toInt();
Expand Down

0 comments on commit d004791

Please sign in to comment.