Skip to content

Commit e79366c

Browse files
timlinuxtimlinux
committed
Merge branch 'release-1_7_0' of github.com:qgis/Quantum-GIS into release-1_7_0
2 parents 908a494 + 962edbb commit e79366c

File tree

8 files changed

+42
-60
lines changed

8 files changed

+42
-60
lines changed

‎CMakeLists.txt

Lines changed: 25 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -439,64 +439,43 @@ INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
439439
LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/src/core ${CMAKE_BINARY_DIR}/src/gui)
440440

441441
#############################################################
442-
# create qgssvnversion.h
442+
# create qgsversion.h
443443

444-
FIND_FILE(SVN_MARKER entries PATHS ${CMAKE_SOURCE_DIR}/.svn)
445-
FIND_FILE(GIT_MARKER index PATHS ${CMAKE_SOURCE_DIR}/.git)
446444

447-
IF (SVN_MARKER)
448-
# See if we have svn installed
449-
FIND_PROGRAM(SVNVERSION svnversion PATHS c:/cygwin/bin)
445+
FIND_FILE(GIT_MARKER index PATHS ${CMAKE_SOURCE_DIR}/.git)
450446

451-
IF(SVNVERSION)
447+
IF (GIT_MARKER)
448+
FIND_PROGRAM(GIT git PATHS c:/cygwin/bin)
449+
IF(GIT)
452450
IF(MSVC)
453451
ADD_CUSTOM_COMMAND(
454-
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
455-
COMMAND for /f usebackq %%a in "(`\"${SVNVERSION}\"`)" do echo \#define QGSSVNVERSION \"%%a\" >${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
456-
MAIN_DEPENDENCY ${SVN_MARKER}
452+
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h
453+
COMMAND for /f \"usebackq tokens=1\" %%a in "(`\"${GIT}\" log -n1 --oneline`)" do echo \#define QGSVERSION \"%%a\" >${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h
454+
MAIN_DEPENDENCY ${GIT_MARKER}
457455
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
458456
)
459457
ELSE(MSVC)
458+
MESSAGE(STATUS "writing ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h")
459+
EXECUTE_PROCESS(COMMAND ${GIT} log -n1 --pretty=%h OUTPUT_VARIABLE REVISION)
460+
STRING(STRIP "${REVISION}" REVISION)
460461
ADD_CUSTOM_COMMAND(
461-
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
462-
COMMAND echo \\\#define QGSSVNVERSION \\\"`${SVNVERSION}`\\\" >${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
463-
MAIN_DEPENDENCY ${SVN_MARKER}
462+
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h
463+
COMMAND echo \\\#define QGSVERSION \\\"${REVISION}\\\" >${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h
464+
MAIN_DEPENDENCY ${GIT_MARKER}
464465
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
465466
)
466467
ENDIF(MSVC)
467-
ELSE(SVNVERSION)
468-
MESSAGE(STATUS "svnversion not found - version will be unknown")
469-
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h "#define QGSSVNVERSION \"unknown\"")
470-
ENDIF (SVNVERSION)
471-
ELSE (SVN_MARKER)
472-
IF (GIT_MARKER)
473-
FIND_PROGRAM(GIT git PATHS c:/cygwin/bin)
474-
IF(GIT)
475-
IF(MSVC)
476-
ADD_CUSTOM_COMMAND(
477-
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
478-
COMMAND for /f \"usebackq tokens=1\" %%a in "(`\"${GIT}\" log -n1 --oneline`)" do echo \#define QGSSVNVERSION \"%%a\" >${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
479-
MAIN_DEPENDENCY ${GIT_MARKER}
480-
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
481-
)
482-
ELSE(MSVC)
483-
ADD_CUSTOM_COMMAND(
484-
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
485-
COMMAND echo \\#define QGSSVNVERSION \\\"$$\( ${GIT} log -n1 --pretty=%h \)\\\" >${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
486-
MAIN_DEPENDENCY ${GIT_MARKER}
487-
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
488-
)
489-
ENDIF(MSVC)
490-
ELSE(GIT)
491-
MESSAGE(STATUS "git marker, but no git found - version will be unknown")
492-
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h "#define QGSSVNVERSION \"unknown\"")
493-
ENDIF(GIT)
494-
ELSE (GIT_MARKER)
495-
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h "#define QGSSVNVERSION \"exported\"")
496-
ENDIF (GIT_MARKER)
497-
ENDIF (SVN_MARKER)
498-
499-
ADD_CUSTOM_TARGET(svnversion ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h)
468+
ELSE(GIT)
469+
MESSAGE(STATUS "git marker, but no git found - version will be unknown")
470+
SET(REVISION "unknown")
471+
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h "#define QGSVERSION \"unknown\"")
472+
ENDIF(GIT)
473+
ELSE (GIT_MARKER)
474+
SET(REVISION "exported")
475+
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h "#define QGSVERSION \"exported\"")
476+
ENDIF (GIT_MARKER)
477+
478+
ADD_CUSTOM_TARGET(version ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h)
500479

501480
#############################################################
502481
# process subdirs

‎python/core/qgis.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ public:
3333
static const int QGIS_VERSION_INT;
3434
// Release name
3535
static const char* QGIS_RELEASE_NAME;
36-
// The subversion version
37-
static const char* QGIS_SVN_VERSION;
36+
// The development (GIT) version
37+
static const char* QGIS_DEV_VERSION;
3838

3939
// Enumerations
4040
//

‎python/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def showException(type, value, tb, msg):
2424
for s in lst:
2525
txt += s.decode('utf-8', 'replace')
2626
txt += '<br>%s<br>%s<br><br>' % (QCoreApplication.translate('Python','Python version:'), sys.version)
27-
txt += '<br>%s<br>%s %s, %s<br><br>' % (QCoreApplication.translate('Python','QGIS version:'), QGis.QGIS_VERSION, QGis.QGIS_RELEASE_NAME, QGis.QGIS_SVN_VERSION)
27+
txt += '<br>%s<br>%s %s, %s<br><br>' % (QCoreApplication.translate('Python','QGIS version:'), QGis.QGIS_VERSION, QGis.QGIS_RELEASE_NAME, QGis.QGIS_DEV_VERSION)
2828
txt += '%s %s' % (QCoreApplication.translate('Python','Python path:'), str(sys.path))
2929
txt = txt.replace('\n', '<br>')
3030
txt = txt.replace(' ', '&nbsp; ') # preserve whitespaces for nicer output

‎src/app/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ typedef SInt32 SRefCon;
6767
#include "qgsmapcanvas.h"
6868
#include "qgsapplication.h"
6969
#include <qgsconfig.h>
70-
#include <qgssvnversion.h>
70+
#include <qgsversion.h>
7171
#include "qgsexception.h"
7272
#include "qgsproject.h"
7373
#include "qgsrectangle.h"
@@ -86,7 +86,7 @@ static const char * const ident_ = "$Id$";
8686
void usage( std::string const & appName )
8787
{
8888
std::cerr << "Quantum GIS - " << VERSION << " '" << RELEASE_NAME << "' ("
89-
<< QGSSVNVERSION << ")\n"
89+
<< QGis::QGIS_DEV_VERSION << ")\n"
9090
<< "Quantum GIS (QGIS) is a viewer for spatial data sets, including\n"
9191
<< "raster and vector data.\n"
9292
<< "Usage: " << appName << " [options] [FILES]\n"

‎src/app/qgisapp.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ static void setTitleBarText_( QWidget & qgisApp )
274274

275275
if ( QString( QGis::QGIS_VERSION ).endsWith( "Trunk" ) )
276276
{
277-
caption += QString( "r%1" ).arg( QGis::QGIS_SVN_VERSION );
277+
caption += QString( "%1" ).arg( QGis::QGIS_DEV_VERSION );
278278
}
279279
else
280280
{
@@ -1916,7 +1916,7 @@ void QgisApp::about()
19161916
abt = new QgsAbout();
19171917
QString versionString = tr( "You are using QGIS version %1 built against code revision %2." )
19181918
.arg( QGis::QGIS_VERSION )
1919-
.arg( QGis::QGIS_SVN_VERSION );
1919+
.arg( QGis::QGIS_DEV_VERSION );
19201920

19211921
versionString += tr( "\nGDAL/OGR Version: %1." ).arg( GDAL_RELEASE_NAME );
19221922

‎src/core/composer/qgscomposerlegenditem.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,12 @@ class CORE_EXPORT QgsComposerRasterSymbolItem: public QgsComposerLegendItem
125125
QString layerID() const { return mLayerID; }
126126
ItemType itemType() const { return RasterSymbolItem; }
127127

128+
void setColor( const QColor& c ){ mColor = c; }
129+
QColor color() const { return mColor; }
130+
128131
private:
129132
QString mLayerID;
133+
QColor mColor;
130134
};
131135

132136
class CORE_EXPORT QgsComposerLayerItem: public QgsComposerLegendItem

‎src/core/qgis.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
* *
1717
***************************************************************************/
1818
#include "qgis.h"
19-
#ifndef QGSSVNVERSION
20-
#include "qgssvnversion.h"
19+
#ifndef QGSVERSION
20+
#include "qgsversion.h"
2121
#endif
2222

2323
#include "qgsconfig.h"
@@ -28,8 +28,8 @@
2828
// Version string
2929
const char* QGis::QGIS_VERSION = VERSION;
3030

31-
// SVN version
32-
const char* QGis::QGIS_SVN_VERSION = QGSSVNVERSION;
31+
// development version
32+
const char* QGis::QGIS_DEV_VERSION = QGSVERSION;
3333

3434
// Version number used for comparing versions using the
3535
// "Check QGIS Version" function

‎src/core/qgis.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
* (at your option) any later version. *
1515
* *
1616
***************************************************************************/
17-
/* $Id$ */
1817

1918
#ifndef QGIS_H
2019
#define QGIS_H
@@ -39,8 +38,8 @@ class CORE_EXPORT QGis
3938
static const int QGIS_VERSION_INT;
4039
// Release name
4140
static const char* QGIS_RELEASE_NAME;
42-
// The subversion version
43-
static const char* QGIS_SVN_VERSION;
41+
// The development version
42+
static const char* QGIS_DEV_VERSION;
4443

4544
// Enumerations
4645
//

0 commit comments

Comments
 (0)