Skip to content
Permalink
Browse files
Drop minimum Qt version to 5.2
  • Loading branch information
nyalldawson committed Sep 20, 2016
1 parent ac4f662 commit fdaa6321ccdc871dc5c48a1e9d7365593c8adc1a
Showing with 5 additions and 3 deletions.
  1. +1 −1 CMakeLists.txt
  2. +2 −2 src/app/main.cpp
  3. +2 −0 src/core/qgsfontutils.cpp
@@ -247,7 +247,7 @@ ELSE (WITH_QTWEBKIT)
ENDIF(WITH_QTWEBKIT)
#############################################################
# search for Qt5
SET(QT_MIN_VERSION 5.5.0)
SET(QT_MIN_VERSION 5.2.0)
FIND_PACKAGE(Qt5Core QUIET)
FIND_PACKAGE(Qt5Gui REQUIRED)
FIND_PACKAGE(Qt5Widgets REQUIRED)
@@ -415,11 +415,11 @@ void myMessageOutput( QtMsgType type, const char *msg )
#endif
}


#if QT_VERSION >= 0x050500
case QtInfoMsg:
myPrint( "Info: %s\n", msg );
break;

#endif
}
}

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

0 comments on commit fdaa632

Please sign in to comment.