diff options
| author | ZackaryWelch <welch.zackary@gmail.com> | 2017-12-20 14:41:24 -0500 |
|---|---|---|
| committer | ZackaryWelch <welch.zackary@gmail.com> | 2017-12-20 14:41:24 -0500 |
| commit | 42f88a91e66cecee677f6e3b3c257436ff748a5c (patch) | |
| tree | 8291711a34ff8866dd0ff95f4d69b11e7dfd3ac2 /src-qt5/core/lumina-desktop-unified/global-includes.h | |
| parent | Fixed keyboard focus and added an information dialog to lumina-pdf (diff) | |
| parent | Setup the RootDesktopObject to start providing NativeWindow objects to the QM... (diff) | |
| download | lumina-42f88a91e66cecee677f6e3b3c257436ff748a5c.tar.gz lumina-42f88a91e66cecee677f6e3b3c257436ff748a5c.tar.bz2 lumina-42f88a91e66cecee677f6e3b3c257436ff748a5c.zip | |
Merge branch 'master' of https://github.com/trueos/lumina
Diffstat (limited to 'src-qt5/core/lumina-desktop-unified/global-includes.h')
| -rw-r--r-- | src-qt5/core/lumina-desktop-unified/global-includes.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src-qt5/core/lumina-desktop-unified/global-includes.h b/src-qt5/core/lumina-desktop-unified/global-includes.h index 40987ad4..fbc3c4f7 100644 --- a/src-qt5/core/lumina-desktop-unified/global-includes.h +++ b/src-qt5/core/lumina-desktop-unified/global-includes.h @@ -59,10 +59,6 @@ #include <QQmlEngine> #include <QQuickImageProvider> -// C++ Backend classes for QML interface -#include <RootDesktopObject.h> -#include <ScreenObject.h> - // libLumina includes #include <LuminaX11.h> #include <LuminaXDG.h> @@ -80,6 +76,9 @@ #include <LIconCache.h> #include <LFileInfo.h> +// C++ Backend classes for QML interface +#include <RootDesktopObject.h> +#include <ScreenObject.h> //Setup any global defines (no classes or global objects: use "global-objects.h" for that) |