Merge master into devel

This commit is contained in:
jfmcarreira committed 2014-07-02 20:41:23 +01:00
1 parent 854484ea43
commit db9a1758b9
4 files changed
+11 -6

No files matched your search

+1 -5
View File
@@ -14,13 +14,9 @@ IF(UNIX)
ENDIF(UNIX)
SET( PROJECT_NAME "playuver" )
SET( PLAYUVER_VERSION_MAJOR "0" )
SET( PLAYUVER_VERSION_MINOR "0" )
SET( PLAYUVER_VERSION_PATCH "9999" )
#SET( PLAYUVER_VERSION_PATCH ${DAY} )
SET( PLAYUVER_VERSION "${PLAYUVER_VERSION_MAJOR}.${PLAYUVER_VERSION_MINOR}.${PLAYUVER_VERSION_PATCH}")
PROJECT( ${PROJECT_NAME} )
INCLUDE( PlaYUVerVersion.cmake )
INCLUDE( cmake/CMakeMacros.cmake )
+4
View File
@@ -0,0 +1,4 @@
SET( PLAYUVER_VERSION_MAJOR "0" )
SET( PLAYUVER_VERSION_MINOR "0" )
SET( PLAYUVER_VERSION_PATCH "9999" )
SET( PLAYUVER_VERSION "${PLAYUVER_VERSION_MAJOR}.${PLAYUVER_VERSION_MINOR}.${PLAYUVER_VERSION_PATCH}")
+6
View File
@@ -26,6 +26,12 @@
#ifndef __CONFIG_PLAYUVER_H__
#define __CONFIG_PLAYUVER_H__
/* Version definition */
#define PLAYUVER_VERSION_MAJOR @PLAYUVER_VERSION_MAJOR@
#define PLAYUVER_VERSION_MINOR @PLAYUVER_VERSION_MINOR@
#define PLAYUVER_VERSION_PATCH @PLAYUVER_VERSION_PATCH@
#define PLAYUVER_VERSION @PLAYUVER_VERSION@
/* QT definition */
#cmakedefine USE_QT4
-1
View File
@@ -139,7 +139,6 @@ Void ViewArea::zoomChangeEvent( Double factor, QPoint center )
setZoomFactor( zoomFactor );
emit zoomFactorChanged( factor, center );
}
void ViewArea::setMode( ViewMode mode )