kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Move qtextitemint ifdef to cmake

Browse source
This commit is contained in:
Ilya Fedin 2021-05-29 05:55:14 +04:00 • committed by John Preston
parent 0dbb210385
commit 6ff8d15de0
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -129,7 +129,6 @@ PRIVATE
ui/style/style_core_scale.h ui/style/style_core_scale.h
ui/style/style_core_types.cpp ui/style/style_core_types.cpp
ui/style/style_core_types.h ui/style/style_core_types.h
ui/text/qtextitemint.cpp
ui/text/text.cpp ui/text/text.cpp
ui/text/text.h ui/text/text.h
ui/text/text_block.cpp ui/text/text_block.cpp
@ -231,7 +230,9 @@ PRIVATE
emoji_suggestions/emoji_suggestions_helper.h emoji_suggestions/emoji_suggestions_helper.h
) )
if (NOT DESKTOP_APP_USE_PACKAGED) if (DESKTOP_APP_USE_PACKAGED)
nice_target_sources(lib_ui ${src_loc} PRIVATE ui/text/qtextitemint.cpp)
else()
nice_target_sources(lib_ui ${src_loc} PRIVATE qt_conf/linux.qrc) nice_target_sources(lib_ui ${src_loc} PRIVATE qt_conf/linux.qrc)
endif() endif()

2
ui/text/qtextitemint.cpp
View file

@ -4,7 +4,6 @@
// For license and copyright information please follow this link: // For license and copyright information please follow this link:
// https://github.com/desktop-app/legal/blob/master/LEGAL // https://github.com/desktop-app/legal/blob/master/LEGAL
// //
#ifdef DESKTOP_APP_USE_PACKAGED
#include <private/qtextengine_p.h> #include <private/qtextengine_p.h>
QTextItemInt::QTextItemInt( QTextItemInt::QTextItemInt(
@ -47,4 +46,3 @@ void QTextItemInt::initWithScriptItem(const QScriptItem &si) {
if (f->d->strikeOut || charFormat.fontStrikeOut()) if (f->d->strikeOut || charFormat.fontStrikeOut())
flags |= QTextItem::StrikeOut; flags |= QTextItem::StrikeOut;
} }
#endif // !DESKTOP_APP_USE_PACKAGED