Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-17 09:34:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replaced Q_WS_ --> Q_OS_

Browse source 
Q_WS macros are not available in Qt5
Restores some functions in Options->General dialog that were not available under Qt5
This commit is contained in:
hunbernd 2015-08-29 21:31:01 +02:00
parent 0b5b20d5ea
commit acc3e4bb62
16 changed files with 39 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/gui/common/Emoticons.cpp
View file

@ -40,7 +40,7 @@ void Emoticons::load()
QString sm_codes;
bool internalEmoticons = true;
#if defined(Q_OS_WIN32)
#if defined(Q_OS_WIN)
// first try external emoticons
QFile sm_file(QApplication::applicationDirPath() + "/emoticons/emotes.acs");
if(sm_file.open(QIODevice::ReadOnly))

2
retroshare-gui/src/gui/common/RSGraphWidget.cpp
View file

@ -518,7 +518,7 @@ void RSGraphWidget::paintTotals()
int x = SCALE_WIDTH*fact + FS, y = 0;
int rowHeight = FS;
#if !defined(Q_WS_MAC)
#if !defined(Q_OS_MAC)
/* On Mac, we don't need vertical spacing between the text rows. */
rowHeight += 5;
#endif