Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Kaidan
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
46
Issues
46
List
Boards
Labels
Service Desk
Milestones
Merge Requests
16
Merge Requests
16
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Network
Kaidan
Commits
3ded4172
Commit
3ded4172
authored
Sep 06, 2018
by
Jonah Brüchert
🌳
Committed by
Linus Jahn
Sep 06, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix non-QWidgets enabled builds
parent
42460ae8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
10 deletions
+14
-10
CMakeLists.txt
CMakeLists.txt
+8
-5
src/main.cpp
src/main.cpp
+6
-5
No files found.
CMakeLists.txt
View file @
3ded4172
...
...
@@ -43,13 +43,16 @@ if(NOT UBUNTU_TOUCH)
DESCRIPTION
"Integration with QWidget based desktop styles"
TYPE OPTIONAL
)
if
(
Qt5Widgets_FOUND
)
set
(
HAVE_QWIDGETS 1
)
add_definitions
(
-DHAVE_QWIDGETS
)
endif
()
if
(
Qt5Widgets_FOUND
)
add_definitions
(
-DHAVE_QWIDGETS -DQAPPLICATION_CLASS=QApplication
)
set
(
__Qt5Widgets_LIBRARIES Qt5::Widgets
)
endif
()
else
()
add_definitions
(
-DQAPPLICATION_CLASS=QGuiApplication
)
endif
()
#
# Load submodules
#
...
...
src/main.cpp
View file @
3ded4172
...
...
@@ -32,11 +32,6 @@
#include <QCommandLineParser>
#include <QCommandLineOption>
#include <QDebug>
#if HAVE_QWIDGETS
#include <QApplication>
#else
#include <QGuiApplication>
#endif
#include <QLocale>
#include <qqml.h>
#include <QQmlApplicationEngine>
...
...
@@ -54,6 +49,12 @@
#include "Globals.h"
#include "Enums.h"
#include "StatusBar.h"
#ifndef QAPPLICATION_CLASS
#define QAPPLICATION_CLASS QApplication
#endif
#include QT_STRINGIFY(QAPPLICATION_CLASS)
// SingleApplication (Qt5 replacement for QtSingleApplication)
#include "singleapp/singleapplication.h"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment