Makefile changed again.

This commit is contained in:
Martin Rotter 2014-01-04 09:54:52 +01:00
parent 84660a1bb4
commit 221ae0930b

View File

@ -153,8 +153,6 @@ endif(CMAKE_BUILD_TYPE STREQUAL "release" OR CMAKE_BUILD_TYPE STREQUAL "Release"
# Force Qt to use string builders.
add_definitions(-DQT_USE_QSTRINGBUILDER)
add_definitions(-DQT_USE_FAST_CONCATENATION)
add_definitions(-DQT_USE_FAST_OPERATOR_PLUS)
# Unicode settings.
add_definitions(-DUNICODE -D_UNICODE)
@ -189,6 +187,21 @@ else(${USE_QT_5})
include(${QT_USE_FILE})
endif(${USE_QT_5})
# Configure QStringBuilder behavior.
if(${USE_QT_5})
message(STATUS "[${APP_LOW_NAME}] Enabling fast QString concatenation.")
add_definitions(-DQT_USE_FAST_CONCATENATION)
add_definitions(-DQT_USE_FAST_OPERATOR_PLUS)
elseif(NOT ${QTVERSION} VERSION_LESS 4.8.0)
message(STATUS "[${APP_LOW_NAME}] Enabling fast QString concatenation.")
add_definitions(-DQT_USE_FAST_CONCATENATION)
add_definitions(-DQT_USE_FAST_OPERATOR_PLUS)
else(NOT ${QTVERSION} VERSION_LESS 4.8.0)
message(STATUS "[${APP_LOW_NAME}] Disabling fast QString concatenation.")
endif(${USE_QT_5})
# Configure executable "properties" for Windows or OS2.
if(WIN32)
message(STATUS "[${APP_LOW_NAME}] Generating executable file properties for Windows.")