sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-06 00:07:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Drop minimum Qt version to 5.2

Browse Source
This commit is contained in:
Nyall Dawson 2016-09-21 08:56:32 +10:00
parent ac4f662899
commit fdaa6321cc
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -247,7 +247,7 @@ ELSE (WITH_QTWEBKIT)
ENDIF(WITH_QTWEBKIT) ENDIF(WITH_QTWEBKIT)
############################################################# #############################################################
# search for Qt5 # search for Qt5
SET(QT_MIN_VERSION 5.5.0) SET(QT_MIN_VERSION 5.2.0)
FIND_PACKAGE(Qt5Core QUIET) FIND_PACKAGE(Qt5Core QUIET)
FIND_PACKAGE(Qt5Gui REQUIRED) FIND_PACKAGE(Qt5Gui REQUIRED)
FIND_PACKAGE(Qt5Widgets REQUIRED) FIND_PACKAGE(Qt5Widgets REQUIRED)

4
src/app/main.cpp
View File

@ -415,11 +415,11 @@ void myMessageOutput( QtMsgType type, const char *msg )
#endif #endif
} }
#if QT_VERSION >= 0x050500
case QtInfoMsg: case QtInfoMsg:
myPrint( "Info: %s\n", msg ); myPrint( "Info: %s\n", msg );
break; break;
#endif
} }
} }

2
src/core/qgsfontutils.cpp
View File

@ -439,6 +439,7 @@ QString QgsFontUtils::asCSS( const QFont& font, double pointToPixelScale )
case QFont::Black: case QFont::Black:
cssWeight = 900; cssWeight = 900;
break; break;
#if QT_VERSION >= 0x050500
case QFont::Thin: case QFont::Thin:
cssWeight = 100; cssWeight = 100;
break; break;
@ -451,6 +452,7 @@ QString QgsFontUtils::asCSS( const QFont& font, double pointToPixelScale )
case QFont::ExtraBold: case QFont::ExtraBold:
cssWeight = 800; cssWeight = 800;
break; break;
#endif
} }
css += QString( "font-weight: %1;" ).arg( cssWeight ); css += QString( "font-weight: %1;" ).arg( cssWeight );