Merge remote-tracking branch 'origin/Applications/17.08'

core/fileprinter.cpp

@@ -537,8 +537,8 @@ QString FilePrinter::mediaPageSize( QPrinter &printer )
     case QPrinter::Letter:     return QStringLiteral("Letter");
     case QPrinter::Tabloid:    return QStringLiteral("Tabloid");
     case QPrinter::Custom:     return QStringLiteral("Custom.%1x%2mm")
-                                            .arg( printer.heightMM() )
-                                            .arg( printer.widthMM() );
+                                            .arg( printer.widthMM() )
+                                            .arg( printer.heightMM() );
     default:                   return QString();
     }
 }

generators/kimgio/CMakeLists.txt

@@ -9,10 +9,12 @@ include_directories(
 okular_add_generator(okularGenerator_kimgio generator_kimgio.cpp)
 target_link_libraries(okularGenerator_kimgio okularcore KF5::KExiv2 KF5::I18n)
 
-add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
-set( kimgiotest_SRCS tests/kimgiotest.cpp ${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp ${CMAKE_SOURCE_DIR}/ui/debug_ui.cpp )
-ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt5::Svg Qt5::Test)
-target_compile_definitions(kimgiotest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_kimgio>")
+if(BUILD_TESTING)
+    add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
+    set( kimgiotest_SRCS tests/kimgiotest.cpp ${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp ${CMAKE_SOURCE_DIR}/ui/debug_ui.cpp )
+    ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt5::Svg Qt5::Test)
+    target_compile_definitions(kimgiotest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_kimgio>")
+endif()
 
 
 ########### install files ###############