Some minor cleaning up, as well as fixed a small mistake in commit f1…

…e6066.

CMakeLists.txt

@@ -322,8 +322,8 @@ IF(APPLE)
         SET(QTWEBKIT QtWebKit)
         SET(QTWEBKITWIDGETS QtWebKitWidgets)
     ELSE()
-        SET(QTWEBKIT QtWebKit)
-        SET(QTWEBKITWIDGETS QtWebKitWidgets)
+        SET(QTWEBKIT)
+        SET(QTWEBKITWIDGETS)
     ENDIF()
 
     SET(MACOS_QT_LIBRARIES
@@ -1296,8 +1296,8 @@ ELSE()
     #       library at a time...
 
     FOREACH(QT_LIBRARY CLucene Core DBus Gui Help Multimedia MultimediaWidgets Network OpenGL Positioning PrintSupport Qml Quick Sensors Sql Svg ${TEST} WebChannel ${WEBKIT} ${WEBKITWIDGETS} Widgets XcbQpa Xml XmlPatterns)
-        IF(   "${QT_LIBRARY}" STREQUAL "WebKit"
-           OR "${QT_LIBRARY}" STREQUAL "WebKitWidgets")
+        IF(   "${QT_LIBRARY}" STREQUAL "${WEBKIT}"
+           OR "${QT_LIBRARY}" STREQUAL "${WEBKITWIDGETS}")
             SET(REAL_QT_LIBRARY_DIR ${QTWEBKIT_LIBRARIES_DIR})
         ELSE()
             SET(REAL_QT_LIBRARY_DIR ${QT_LIBRARY_DIR})

cmake/common.cmake

@@ -723,8 +723,7 @@ MACRO(MACOS_CLEAN_UP_FILE_WITH_QT_DEPENDENCIES PROJECT_TARGET DIRNAME FILENAME)
         ENDIF()
 
         IF("${PROJECT_TARGET}" STREQUAL "DIRECT")
-            EXECUTE_PROCESS(
-                            COMMAND install_name_tool -change ${OLD_REFERENCE} ${NEW_REFERENCE} ${FULL_FILENAME})
+            EXECUTE_PROCESS(COMMAND install_name_tool -change ${OLD_REFERENCE} ${NEW_REFERENCE} ${FULL_FILENAME})
         ELSE()
             ADD_CUSTOM_COMMAND(TARGET ${PROJECT_TARGET} POST_BUILD
                                COMMAND install_name_tool -change ${OLD_REFERENCE} ${NEW_REFERENCE} ${FULL_FILENAME})
@@ -752,8 +751,8 @@ MACRO(MACOS_DEPLOY_QT_LIBRARY LIBRARY_NAME)
 
     SET(QT_FRAMEWORK_DIR ${LIBRARY_NAME}.framework/Versions/${QT_VERSION_MAJOR})
 
-    IF(   "${LIBRARY_NAME}" STREQUAL "QtWebKit"
-       OR "${LIBRARY_NAME}" STREQUAL "QtWebKitWidgets")
+    IF(   "${LIBRARY_NAME}" STREQUAL "${QTWEBKIT}"
+       OR "${LIBRARY_NAME}" STREQUAL "${QTWEBKITWIDGETS}")
         SET(REAL_QT_LIBRARY_DIR ${QTWEBKIT_LIBRARIES_DIR})
     ELSE()
         SET(REAL_QT_LIBRARY_DIR ${QT_LIBRARY_DIR})