diff --git a/ground/openpilotgcs/src/app/app.pro b/ground/openpilotgcs/src/app/app.pro index 598201b2b..d7b33ccae 100644 --- a/ground/openpilotgcs/src/app/app.pro +++ b/ground/openpilotgcs/src/app/app.pro @@ -33,6 +33,10 @@ win32 { QMAKE_RPATHDIR = \'\$$ORIGIN\'/$$relative_path($$GCS_LIBRARY_PATH, $$GCS_APP_PATH) QMAKE_RPATHDIR += \'\$$ORIGIN\'/$$relative_path($$GCS_QT_LIBRARY_PATH, $$GCS_APP_PATH) include(../rpath.pri) + + equals(copyqt, 1) { + RESOURCES += qtconf.qrc + } } OTHER_FILES += openpilotgcs.rc diff --git a/ground/openpilotgcs/src/app/qt.conf b/ground/openpilotgcs/src/app/qt.conf new file mode 100644 index 000000000..f83499f3f --- /dev/null +++ b/ground/openpilotgcs/src/app/qt.conf @@ -0,0 +1,2 @@ +[Paths] +Prefix = ../lib/openpilotgcs/qt5/ diff --git a/ground/openpilotgcs/src/app/qtconf.qrc b/ground/openpilotgcs/src/app/qtconf.qrc new file mode 100644 index 000000000..bd4633fa9 --- /dev/null +++ b/ground/openpilotgcs/src/app/qtconf.qrc @@ -0,0 +1,5 @@ + + + qt.conf + + diff --git a/package/linux/qt.conf b/package/linux/qt.conf deleted file mode 100644 index b8dd60015..000000000 --- a/package/linux/qt.conf +++ /dev/null @@ -1,6 +0,0 @@ -[Paths] -Prefix = .. -Plugins = lib/qt5/plugins -Imports = lib/qt5/qml -Qml2Imports = lib/qt5/qml -Libraries = lib/qt5