Ported to Qt5.

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 2.8.12)
 
 ###############################################################################
 # Top-Level gLabels project
@@ -29,17 +29,19 @@ if (WIN32)
 	# Make sure we can find MINGW libraries, e.g. zlib
 	set (CMAKE_PREFIX_PATH C:/MinGW )
 endif ()
-	
-find_package(Qt4 4.8.4 REQUIRED QtCore QtGui QtXml)
-find_package(ZLIB REQUIRED)
 
-include (${QT_USE_FILE})
+find_package(Qt5Widgets 5.4 REQUIRED)
+find_package(Qt5PrintSupport 5.4 REQUIRED)
+find_package(Qt5Xml 5.4 REQUIRED)
+
+find_package(ZLIB 1.2 REQUIRED)
 
 
 #=======================================
 # Compilation
 #=======================================
-add_definitions (-std=c++11 -g)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+add_definitions (-std=c++11 -g -fPIC)
 
 
 #=======================================

glabels/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 2.8.12)
 
 ###############################################################################
 # gLabels application subproject
@@ -113,9 +113,9 @@ set (glabels_resource_files
   images.qrc
 )
 
-qt4_wrap_cpp (glabels_moc_sources ${glabels_qobject_headers})
+qt5_wrap_cpp (glabels_moc_sources ${glabels_qobject_headers})
-qt4_wrap_ui (glabels_forms_headers ${glabels_forms})
+qt5_wrap_ui (glabels_forms_headers ${glabels_forms})
-qt4_add_resources (glabels_qrc_sources ${glabels_resource_files})
+qt5_add_resources (glabels_qrc_sources ${glabels_resource_files})
 
 add_executable (glabels-qt
   ${glabels_sources}
@@ -127,7 +127,9 @@ add_executable (glabels-qt
 target_link_libraries (glabels-qt
   Merge
   libglabels
-  ${QT_LIBRARIES}
+  ${Qt5Widgets_LIBRARIES}
+  ${Qt5PrintSupport_LIBRARIES}
+  ${Qt5Xml_LIBRARIES}
   ${ZLIB_LIBRARIES}
 )
 
@@ -137,9 +139,10 @@ target_link_libraries (glabels-qt
 #=======================================
 include_directories (
   ${ZLIB_INCLUDE_DIRS}
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}
   ${glabels_qt_SOURCE_DIR}
+  ${Qt5Widgets_INCLUDE_DIRS}
+  ${Qt5PrintSupport_INCLUDE_DIRS}
+  ${Qt5Xml_INCLUDE_DIRS}
 )
 
 link_directories (

glabels/LabelEditor.cpp

@@ -379,7 +379,7 @@ LabelEditor::mousePressEvent( QMouseEvent* event )
 		transform.scale( mScale, mScale );
 		transform.translate( mX0.pt(), mY0.pt() );
 
-		QPointF pWorld = transform.inverted().map( event->posF() );
+		QPointF pWorld = transform.inverted().map( event->pos() );
 		glabels::Distance xWorld = glabels::Distance::pt( pWorld.x() );
 		glabels::Distance yWorld = glabels::Distance::pt( pWorld.y() );
 
@@ -548,7 +548,7 @@ LabelEditor::mouseMoveEvent( QMouseEvent* event )
 		transform.scale( mScale, mScale );
 		transform.translate( mX0.pt(), mY0.pt() );
 
-		QPointF pWorld = transform.inverted().map( event->posF() );
+		QPointF pWorld = transform.inverted().map( event->pos() );
 		glabels::Distance xWorld = glabels::Distance::pt( pWorld.x() );
 		glabels::Distance yWorld = glabels::Distance::pt( pWorld.y() );
 
@@ -650,7 +650,7 @@ LabelEditor::mouseReleaseEvent( QMouseEvent* event )
 		transform.scale( mScale, mScale );
 		transform.translate( mX0.pt(), mY0.pt() );
 
-		QPointF pWorld = transform.inverted().map( event->posF() );
+		QPointF pWorld = transform.inverted().map( event->pos() );
 		glabels::Distance xWorld = glabels::Distance::pt( pWorld.x() );
 		glabels::Distance yWorld = glabels::Distance::pt( pWorld.y() );
 
@@ -1065,8 +1065,11 @@ LabelEditor::drawMarkupLayer( QPainter* painter )
 	{
 		painter->save();
 
+		QPen pen( markupLineColor, markupLineWidthPixels );
+		pen.setCosmetic( true );
+		
 		painter->setBrush( Qt::NoBrush );
-		painter->setPen( QPen( markupLineColor ) );
+		painter->setPen( pen );
 
 		if ( mModel->rotate() )
 		{

glabels/Merge/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 2.8.12)
 
 ###############################################################################
 # gLabels Merge subsystem
@@ -29,21 +29,11 @@ set (merge_qobject_headers
   Merge.h
 )
 
-set (merge_forms
+qt5_wrap_cpp (merge_moc_sources ${merge_qobject_headers})
-)
-
-set (merge_resource_files
-)
-
-qt4_wrap_cpp (merge_moc_sources ${merge_qobject_headers})
-qt4_wrap_ui (merge_forms_headers ${merge_forms})
-qt4_add_resources (merge_qrc_sources ${merge_resource_files})
 
 add_library (Merge STATIC
   ${merge_sources}
   ${merge_moc_sources}
-  ${merge_qrc_sources}
-  ${merge_forms_headers}
 )
 
 
@@ -51,6 +41,7 @@ add_library (Merge STATIC
 # Where to find stuff
 #=======================================
 include_directories (
+  ${Qt5Widgets_INCLUDE_DIRS}
 )
 
 link_directories (

libglabels/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 2.8.12)
 
 ###############################################################################
 # gLabels libglabels subproject
@@ -43,8 +43,8 @@ set (libglabels_qobject_headers
 set (libglabels_resource_files
 )
 
-qt4_wrap_cpp (libglabels_moc_sources ${libglabels_qobject_headers})
+qt5_wrap_cpp (libglabels_moc_sources ${libglabels_qobject_headers})
-qt4_add_resources(libglabels_qrc_sources ${libglabels_resource_files})
+qt5_add_resources(libglabels_qrc_sources ${libglabels_resource_files})
 
 add_library (libglabels
   ${libglabels_sources}
@@ -57,7 +57,8 @@ add_library (libglabels
 # Where to find stuff
 #=======================================
 include_directories (
-  ${CMAKE_CURRENT_BINARY_DIR}
+  ${Qt5Widgets_INCLUDE_DIRS}
+  ${Qt5Xml_INCLUDE_DIRS}
 )
 
 link_directories (

libglabels/StrUtil.cpp

@@ -151,7 +151,7 @@ namespace glabels
 				QString chunk1, chunk2;
 				bool   isnum1, isnum2;
 
-				if ( folded_s1.at( i1 ).isNumber() )
+				if ( (i1 < folded_s1.size()) && folded_s1.at( i1 ).isNumber() )
 				{
 					chunk1 = spanDigits( folded_s1, &i1 );
 					isnum1 = true;
@@ -162,7 +162,7 @@ namespace glabels
 					isnum1 = false;
 				}
                 
-				if ( folded_s2.at( i2 ).isNumber() )
+				if ( (i2 < folded_s2.size()) && folded_s2.at( i2 ).isNumber() )
 				{
 					chunk2 = spanDigits( folded_s2, &i2 );
 					isnum2 = true;