notsoyuzu
/
yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2405 from lioncash/qt 

CMakeLists: Define QT_USE_QSTRINGBUILDER for the Qt target
This commit is contained in:
bunnei 2019-04-16 22:17:09 -04:00 committed by GitHub
parent 1b83f255c2 d28bb56c91
commit be6b9e2d2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/yuzu/CMakeLists.txt
View File

@ -151,6 +151,12 @@ target_link_libraries(yuzu PRIVATE common core input_common video_core)
target_link_libraries(yuzu PRIVATE Boost::boost glad Qt5::OpenGL Qt5::Widgets) target_link_libraries(yuzu PRIVATE Boost::boost glad Qt5::OpenGL Qt5::Widgets)
target_link_libraries(yuzu PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) target_link_libraries(yuzu PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
target_compile_definitions(yuzu PRIVATE
# Use QStringBuilder for string concatenation to reduce
# the overall number of temporary strings created.
-DQT_USE_QSTRINGBUILDER
)
if (YUZU_ENABLE_COMPATIBILITY_REPORTING) if (YUZU_ENABLE_COMPATIBILITY_REPORTING)
target_compile_definitions(yuzu PRIVATE -DYUZU_ENABLE_COMPATIBILITY_REPORTING) target_compile_definitions(yuzu PRIVATE -DYUZU_ENABLE_COMPATIBILITY_REPORTING)
endif() endif()

2
src/yuzu/game_list_p.h
View File

@ -95,7 +95,7 @@ public:
if (row2.isEmpty()) if (row2.isEmpty())
return row1; return row1;
return row1 + "\n " + row2; return QString(row1 + "\n " + row2);
} }
return GameListItem::data(role); return GameListItem::data(role);