Merge branch 'master' of github.com:qcad/qcad

allenb2800 · Jan 31, 2022 · e787a41 · e787a41
2 parents 9d62bd2 + 05739fa
commit e787a41
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/src/core/RS.h b/src/core/RS.h
@@ -24,7 +24,6 @@
 
 #include <QApplication>
 #include <QDebug>
-#include <QDesktopWidget>
 #include <QEasingCurve>
 #include <QGuiApplication>
 #include <QPair>
@@ -34,6 +33,7 @@
 #include <QVariant>
 
 #if QT_VERSION >= 0x060000
+#include <QDesktopWidget>
 #include <QScreen>
 #endif
 

diff --git a/src/scripts/scripts.qrc b/src/scripts/scripts.qrc
@@ -1673,6 +1673,7 @@
     <file alias="scripts/Misc/MiscIO/MolImport/MolImport.svg">../../scripts/Misc/MiscIO/MolImport/MolImport.svg</file>
     <file alias="scripts/Misc/MiscIO/MolImport/MolImportInit.js">../../scripts/Misc/MiscIO/MolImport/MolImportInit.js</file>
     <file alias="scripts/Misc/MiscIO/MolImport/MolImporter.js">../../scripts/Misc/MiscIO/MolImport/MolImporter.js</file>
+    <file alias="scripts/Misc/MiscInformation/InfoBearing/InfoBearing.js">../../scripts/Misc/MiscInformation/InfoBearing/InfoBearing.js</file>
     <file alias="scripts/Misc/MiscInformation/InfoCentroids/Centroid-examples-v32.dxf">../../scripts/Misc/MiscInformation/InfoCentroids/Centroid-examples-v32.dxf</file>
     <file alias="scripts/Misc/MiscInformation/InfoCentroids/InfoAddCustomCentroid/AddCentroidDialog.ui">../../scripts/Misc/MiscInformation/InfoCentroids/InfoAddCustomCentroid/AddCentroidDialog.ui</file>
     <file alias="scripts/Misc/MiscInformation/InfoCentroids/InfoAddCustomCentroid/InfoAddCustomCentroid-inverse.svg">../../scripts/Misc/MiscInformation/InfoCentroids/InfoAddCustomCentroid/InfoAddCustomCentroid-inverse.svg</file>

diff --git a/src/scripts/scripts_release.qrc b/src/scripts/scripts_release.qrc
@@ -1180,6 +1180,7 @@
     <file alias="scripts/Misc/MiscIO/MolImport/MolImport.svg">../../scripts/Misc/MiscIO/MolImport/MolImport.svg</file>
     <file alias="scripts/Misc/MiscIO/MolImport/MolImportInit.js">../../scripts/Misc/MiscIO/MolImport/MolImportInit.js</file>
     <file alias="scripts/Misc/MiscIO/MolImport/MolImporter.js">../../scripts/Misc/MiscIO/MolImport/MolImporter.js</file>
+    <file alias="scripts/Misc/MiscInformation/InfoBearing/InfoBearing.js">../../scripts/Misc/MiscInformation/InfoBearing/InfoBearing.js</file>
     <file alias="scripts/Misc/MiscInformation/InfoCentroids/InfoAddCustomCentroid/AddCentroidDialog.ui">../../scripts/Misc/MiscInformation/InfoCentroids/InfoAddCustomCentroid/AddCentroidDialog.ui</file>
     <file alias="scripts/Misc/MiscInformation/InfoCentroids/InfoAddCustomCentroid/InfoAddCustomCentroid-inverse.svg">../../scripts/Misc/MiscInformation/InfoCentroids/InfoAddCustomCentroid/InfoAddCustomCentroid-inverse.svg</file>
     <file alias="scripts/Misc/MiscInformation/InfoCentroids/InfoAddCustomCentroid/InfoAddCustomCentroid.js">../../scripts/Misc/MiscInformation/InfoCentroids/InfoAddCustomCentroid/InfoAddCustomCentroid.js</file>