Zergling_man/moment
Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

utils.h: check for Q_OS_LINUX, not _UNIX

Browse Source
This commit is contained in:
miruka 2020-07-16 23:03:43 -04:00
parent b69cbf9d14
commit aff5f45ca0
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
INSTALL.md
View File

@ -92,8 +92,8 @@ in this example [yay](https://github.com/Jguer/yay) for the release version:
The equivalent `-dev` or `-devel` packages are needed, if your distro The equivalent `-dev` or `-devel` packages are needed, if your distro
splits development headers into their own packages. splits development headers into their own packages.
To enable X11-specific features, **libX11** and **libXScrnSaver** / **libXss** To enable X11-specific features on Linux,
are needed. **libX11** and **libXScrnSaver** / **libXss** are needed.
The requirements can be disabled by adding `CONFIG+=no-x11` to the The requirements can be disabled by adding `CONFIG+=no-x11` to the
`qmake mirage.pro` command. `qmake mirage.pro` command.
@ -282,7 +282,7 @@ make
sudo make install sudo make install
``` ```
To compile without the X11-specific dependencies and features, To compile without the X11-specific dependencies and features on Linux,
run `qmake mirage.pro CONFIG+=no-x11` instead of `qmake mirage.pro`. run `qmake mirage.pro CONFIG+=no-x11` instead of `qmake mirage.pro`.
If everything went fine, run `mirage` to start. If everything went fine, run `mirage` to start.

17
TODO.md
View File

@ -1,20 +1,16 @@
# TODO # TODO
- global presence control - global presence control
- idlemanager: what if setPresence call fails due to network? - retrieve last seen time for offline members on hover/in profile/automatically
- fix power level control button layout when apply button is loading
- joining new DM → not loading past events the first time?
- fix HLabeledItem disabled opacity - fix HLabeledItem disabled opacity
(visible for the topic area in room settings) (visible for the topic area in room settings)
- mark accounts as offline when closing mirage
- retrieve last seen time for offline members on hover/in profile/automatically
- retry if media retrieval request ends up with a 404
- fix members not synced bug - fix members not synced bug
- fix local unread counters order - fix local unread counters order
- member profile: if no devices show up, warn about no E2E rooms shared or - fix power level control button layout when apply button is loading
no E2E-aware devices for that member
- @room?
- publish room or alias control
- open context menus centered on touch screens - open context menus centered on touch screens
- auto-idle for Windows and OSX - auto-idle for Windows and OSX
@ -24,6 +20,9 @@
- General change/upload avatar component for account and room settings - General change/upload avatar component for account and room settings
- Refactor EventList.qml - Refactor EventList.qml
- Implement different delegate for different types of events in QML, instead
of having only one doing everything with untranslatable content texts
from Python
## Issues ## Issues

6
src/utils.h
View File

@ -11,9 +11,9 @@
#include <QObject> #include <QObject>
#include <QUuid> #include <QUuid>
#ifdef Q_OS_UNIX #ifdef Q_OS_LINUX
#ifndef NO_X11 #ifndef NO_X11
#define USE_UNIX_AUTOAWAY #define USE_LINUX_AUTOAWAY
#include <X11/extensions/scrnsaver.h> #include <X11/extensions/scrnsaver.h>
#endif #endif
#endif #endif
@ -54,7 +54,7 @@ public slots:
#ifdef Q_OS_DARWIN #ifdef Q_OS_DARWIN
return -1; return -1;
#elif defined(USE_UNIX_AUTOAWAY) #elif defined(USE_LINUX_AUTOAWAY)
Display *display = XOpenDisplay(NULL); Display *display = XOpenDisplay(NULL);
if (! display) return -1; if (! display) return -1;