- refresh Qt version + refresh linuxdeployqt + better logging in idle tracking + version increase
This commit is contained in:
parent
61ef94b474
commit
9c48fe5f38
@ -4,10 +4,10 @@
|
|||||||
// App version
|
// App version
|
||||||
#define QBREAK_VERSION_MAJOR 0
|
#define QBREAK_VERSION_MAJOR 0
|
||||||
#define QBREAK_VERSION_MINOR 1
|
#define QBREAK_VERSION_MINOR 1
|
||||||
#define QBREAK_VERSION_SUFFIX 16
|
#define QBREAK_VERSION_SUFFIX 17
|
||||||
|
|
||||||
// How often UI is updated - interval in seconds
|
// How often UI is updated - interval in seconds
|
||||||
#define INTERVAL_UPDATE_UI (15)
|
#define INTERVAL_UPDATE_UI (10)
|
||||||
|
|
||||||
// How often progress bar is updated - interval in milliseconds
|
// How often progress bar is updated - interval in milliseconds
|
||||||
#define INTERVAL_UPDATE_PROGRESS (1000)
|
#define INTERVAL_UPDATE_PROGRESS (1000)
|
||||||
|
|||||||
@ -210,6 +210,7 @@ int get_idle_time_kde_wayland()
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
static bool Warning_X11InWayland = false;
|
||||||
int get_idle_time_dynamically()
|
int get_idle_time_dynamically()
|
||||||
{
|
{
|
||||||
const char* wl_display = std::getenv("WAYLAND_DISPLAY");
|
const char* wl_display = std::getenv("WAYLAND_DISPLAY");
|
||||||
@ -235,8 +236,14 @@ int get_idle_time_dynamically()
|
|||||||
#else
|
#else
|
||||||
// Restrict to X11
|
// Restrict to X11
|
||||||
if (wl_display)
|
if (wl_display)
|
||||||
|
{
|
||||||
|
// One time error message
|
||||||
|
if (!Warning_X11InWayland) {
|
||||||
|
qDebug() << "Wayland is found, but app built for X11 only. Idle tracking is not supported.";
|
||||||
|
Warning_X11InWayland = true;
|
||||||
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
}
|
||||||
return get_idle_time_x11();
|
return get_idle_time_x11();
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|||||||
@ -2,9 +2,9 @@
|
|||||||
|
|
||||||
# I use this script on two different hosts so there are logic to find proper Qt installation
|
# I use this script on two different hosts so there are logic to find proper Qt installation
|
||||||
|
|
||||||
export QT_HOME=/home/$USER/tools/qt/6.4.2/gcc_64
|
export QT_HOME=/home/$USER/tools/qt/6.8.0/gcc_64
|
||||||
if [ ! -d "$QT_HOME" ] ; then
|
if [ ! -d "$QT_HOME" ] ; then
|
||||||
export QT_HOME=/home/$USER/tools/qt/6.4.2/gcc_64
|
export QT_HOME=/home/$USER/tools/qt/6.8.0/gcc_64
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Build .appimage
|
# Build .appimage
|
||||||
|
|||||||
@ -2,9 +2,9 @@
|
|||||||
|
|
||||||
# I use this script on two different hosts so there are logic to find proper Qt installation
|
# I use this script on two different hosts so there are logic to find proper Qt installation
|
||||||
|
|
||||||
export QT_HOME=/home/$USER/tools/qt/6.4.2/gcc_64
|
export QT_HOME=/home/$USER/tools/qt/6.8.0/gcc_64
|
||||||
if [ ! -d "$QT_HOME" ] ; then
|
if [ ! -d "$QT_HOME" ] ; then
|
||||||
export QT_HOME=/home/$USER/tools/qt/6.4.2/gcc_64
|
export QT_HOME=/home/$USER/tools/qt/6.8.0/gcc_64
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Build .appimage
|
# Build .appimage
|
||||||
|
|||||||
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user