From 9dabf9b2a1f183bbdb3aef6c016943de14b47cf1 Mon Sep 17 00:00:00 2001
From: Dorian Zedler <dorian@itsblue.de>
Date: Fri, 3 Jul 2020 14:33:28 +0200
Subject: [PATCH] changed the include strategy from subdir to direct

---
 Qt-Secret/{ => GMP}/.gitignore                |  0
 Qt-Secret/{src => }/GMP/GMP.pri               | 21 ++++++-----
 Qt-Secret/{src => }/GMP/GMP.pro               |  0
 Qt-Secret/{src => }/GMP/LICENSE               |  0
 Qt-Secret/{src => }/GMP/bigint.cpp            |  0
 Qt-Secret/{src => }/GMP/bigint.h              |  0
 Qt-Secret/{src => }/GMP/mini-gmp.c            |  0
 Qt-Secret/{src => }/GMP/mini-gmp.h            |  0
 Qt-Secret/{src => }/GMP/minigmp_global.h      |  0
 Qt-Secret/{src => }/Qt-RSA/qrsaencryption.cpp |  0
 Qt-Secret/{src => }/Qt-RSA/qrsaencryption.h   |  0
 Qt-Secret/{src => }/Qt-Secret.pri             | 18 +++++-----
 Qt-Secret/Qt-Secret.pro                       | 34 ++++++++++++++----
 Qt-Secret/{src => }/qtsecret_global.h         |  0
 Qt-Secret/src/.gitignore                      |  1 -
 Qt-Secret/src/GMP/.gitignore                  |  1 -
 Qt-Secret/src/Qt-Secret.pro                   | 36 -------------------
 17 files changed, 48 insertions(+), 63 deletions(-)
 rename Qt-Secret/{ => GMP}/.gitignore (100%)
 rename Qt-Secret/{src => }/GMP/GMP.pri (51%)
 rename Qt-Secret/{src => }/GMP/GMP.pro (100%)
 rename Qt-Secret/{src => }/GMP/LICENSE (100%)
 rename Qt-Secret/{src => }/GMP/bigint.cpp (100%)
 rename Qt-Secret/{src => }/GMP/bigint.h (100%)
 rename Qt-Secret/{src => }/GMP/mini-gmp.c (100%)
 rename Qt-Secret/{src => }/GMP/mini-gmp.h (100%)
 rename Qt-Secret/{src => }/GMP/minigmp_global.h (100%)
 rename Qt-Secret/{src => }/Qt-RSA/qrsaencryption.cpp (100%)
 rename Qt-Secret/{src => }/Qt-RSA/qrsaencryption.h (100%)
 rename Qt-Secret/{src => }/Qt-Secret.pri (54%)
 rename Qt-Secret/{src => }/qtsecret_global.h (100%)
 delete mode 100644 Qt-Secret/src/.gitignore
 delete mode 100644 Qt-Secret/src/GMP/.gitignore
 delete mode 100644 Qt-Secret/src/Qt-Secret.pro

diff --git a/Qt-Secret/.gitignore b/Qt-Secret/GMP/.gitignore
similarity index 100%
rename from Qt-Secret/.gitignore
rename to Qt-Secret/GMP/.gitignore
diff --git a/Qt-Secret/src/GMP/GMP.pri b/Qt-Secret/GMP/GMP.pri
similarity index 51%
rename from Qt-Secret/src/GMP/GMP.pri
rename to Qt-Secret/GMP/GMP.pri
index 128faad..73112bb 100644
--- a/Qt-Secret/src/GMP/GMP.pri
+++ b/Qt-Secret/GMP/GMP.pri
@@ -8,14 +8,17 @@
 !isEmpty(Qt_GMP_LIB):error("GMP.pri already included")
 Qt_GMP_LIB = 1
 
-#DEPENDS
-CONFIG(release, debug|release): {
-    MINIGMP_LIBRARY_OUTPUT_DIR="$$PWD/build/release"
-} else {
-    MINIGMP_LIBRARY_OUTPUT_DIR="$$PWD/build/debug"
-}
-unix:LIBS += -L$$MINIGMP_LIBRARY_OUTPUT_DIR -lQtBigInt
+DEFINES += MINIGMP_LIBRARY
+DEFINES += QT_DEPRECATED_WARNINGS
 
-win32:LIBS += -L$$MINIGMP_LIBRARY_OUTPUT_DIR -lQtBigInt
+HEADERS += \
+    $$PWD/bigint.h \
+    $$PWD/mini-gmp.h \
+    $$PWD/minigmp_global.h
 
-INCLUDEPATH += "$$PWD"
+SOURCES += \
+    $$PWD/bigint.cpp \
+    $$PWD/mini-gmp.c
+
+
+INCLUDEPATH += $$PWD
diff --git a/Qt-Secret/src/GMP/GMP.pro b/Qt-Secret/GMP/GMP.pro
similarity index 100%
rename from Qt-Secret/src/GMP/GMP.pro
rename to Qt-Secret/GMP/GMP.pro
diff --git a/Qt-Secret/src/GMP/LICENSE b/Qt-Secret/GMP/LICENSE
similarity index 100%
rename from Qt-Secret/src/GMP/LICENSE
rename to Qt-Secret/GMP/LICENSE
diff --git a/Qt-Secret/src/GMP/bigint.cpp b/Qt-Secret/GMP/bigint.cpp
similarity index 100%
rename from Qt-Secret/src/GMP/bigint.cpp
rename to Qt-Secret/GMP/bigint.cpp
diff --git a/Qt-Secret/src/GMP/bigint.h b/Qt-Secret/GMP/bigint.h
similarity index 100%
rename from Qt-Secret/src/GMP/bigint.h
rename to Qt-Secret/GMP/bigint.h
diff --git a/Qt-Secret/src/GMP/mini-gmp.c b/Qt-Secret/GMP/mini-gmp.c
similarity index 100%
rename from Qt-Secret/src/GMP/mini-gmp.c
rename to Qt-Secret/GMP/mini-gmp.c
diff --git a/Qt-Secret/src/GMP/mini-gmp.h b/Qt-Secret/GMP/mini-gmp.h
similarity index 100%
rename from Qt-Secret/src/GMP/mini-gmp.h
rename to Qt-Secret/GMP/mini-gmp.h
diff --git a/Qt-Secret/src/GMP/minigmp_global.h b/Qt-Secret/GMP/minigmp_global.h
similarity index 100%
rename from Qt-Secret/src/GMP/minigmp_global.h
rename to Qt-Secret/GMP/minigmp_global.h
diff --git a/Qt-Secret/src/Qt-RSA/qrsaencryption.cpp b/Qt-Secret/Qt-RSA/qrsaencryption.cpp
similarity index 100%
rename from Qt-Secret/src/Qt-RSA/qrsaencryption.cpp
rename to Qt-Secret/Qt-RSA/qrsaencryption.cpp
diff --git a/Qt-Secret/src/Qt-RSA/qrsaencryption.h b/Qt-Secret/Qt-RSA/qrsaencryption.h
similarity index 100%
rename from Qt-Secret/src/Qt-RSA/qrsaencryption.h
rename to Qt-Secret/Qt-RSA/qrsaencryption.h
diff --git a/Qt-Secret/src/Qt-Secret.pri b/Qt-Secret/Qt-Secret.pri
similarity index 54%
rename from Qt-Secret/src/Qt-Secret.pri
rename to Qt-Secret/Qt-Secret.pri
index 7818b93..dfa6c3c 100644
--- a/Qt-Secret/src/Qt-Secret.pri
+++ b/Qt-Secret/Qt-Secret.pri
@@ -8,17 +8,17 @@
 !isEmpty(Qt_SECRET_LIB):error("Qt-Secret.pri already included")
 Qt_SECRET_LIB = 1
 
-#DEPENDS
-CONFIG(release, debug|release): {
-    Qt_SECRET_LIB_OUTPUT_DIR="$$PWD/build/release"
-} else {
-    Qt_SECRET_LIB_OUTPUT_DIR="$$PWD/build/debug"
-}
+DEFINES += Qt_SECRET_LIBRARY
+DEFINES += QT_DEPRECATED_WARNINGS
 
-unix:LIBS += -L$$Qt_SECRET_LIB_OUTPUT_DIR -lQt-Secret
+HEADERS += \
+           $$PWD/qtsecret_global.h \
+           $$PWD/Qt-RSA/qrsaencryption.h
 
-win32:LIBS += -L$$Qt_SECRET_LIB_OUTPUT_DIR -lQt-Secret1
+SOURCES += \
+           $$PWD/Qt-RSA/qrsaencryption.cpp
 
-INCLUDEPATH += "$$PWD/Qt-RSA"
+
+INCLUDEPATH += $$PWD $$PWD/Qt-RSA
 
 include($$PWD/GMP/GMP.pri)
diff --git a/Qt-Secret/Qt-Secret.pro b/Qt-Secret/Qt-Secret.pro
index e9fe755..f62c07f 100644
--- a/Qt-Secret/Qt-Secret.pro
+++ b/Qt-Secret/Qt-Secret.pro
@@ -5,12 +5,32 @@
 # of this license document, but changing it is not allowed.
 #
 
-TEMPLATE = subdirs
-CONFIG += ordered
+QT -= gui
+CONFIG += c++11
 
-SUBDIRS += \
-           GMP \
-           src
+TARGET = Qt-Secret
+TEMPLATE = lib
 
-GMP.file = src/GMP/GMP.pro
-src.file = src/Qt-Secret.pro
+DEFINES += Qt_SECRET_LIBRARY
+DEFINES += QT_DEPRECATED_WARNINGS
+
+#DEPENDS
+CONFIG(release, debug|release): {
+    DESTDIR="$$PWD/build/release"
+} else {
+    DESTDIR="$$PWD/build/debug"
+}
+
+include($$PWD/GMP/GMP.pri)
+
+VERSION = 1.2.0
+
+HEADERS += \
+           qtsecret_global.h \
+           Qt-RSA/qrsaencryption.h
+
+SOURCES += \
+           Qt-RSA/qrsaencryption.cpp
+
+target.path = /usr/local/lib
+!isEmpty(target.path): INSTALLS += target
diff --git a/Qt-Secret/src/qtsecret_global.h b/Qt-Secret/qtsecret_global.h
similarity index 100%
rename from Qt-Secret/src/qtsecret_global.h
rename to Qt-Secret/qtsecret_global.h
diff --git a/Qt-Secret/src/.gitignore b/Qt-Secret/src/.gitignore
deleted file mode 100644
index 84c048a..0000000
--- a/Qt-Secret/src/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build/
diff --git a/Qt-Secret/src/GMP/.gitignore b/Qt-Secret/src/GMP/.gitignore
deleted file mode 100644
index 84c048a..0000000
--- a/Qt-Secret/src/GMP/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build/
diff --git a/Qt-Secret/src/Qt-Secret.pro b/Qt-Secret/src/Qt-Secret.pro
deleted file mode 100644
index f62c07f..0000000
--- a/Qt-Secret/src/Qt-Secret.pro
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (C) 2018-2019 QuasarApp.
-# Distributed under the lgplv3 software license, see the accompanying
-# Everyone is permitted to copy and distribute verbatim copies
-# of this license document, but changing it is not allowed.
-#
-
-QT -= gui
-CONFIG += c++11
-
-TARGET = Qt-Secret
-TEMPLATE = lib
-
-DEFINES += Qt_SECRET_LIBRARY
-DEFINES += QT_DEPRECATED_WARNINGS
-
-#DEPENDS
-CONFIG(release, debug|release): {
-    DESTDIR="$$PWD/build/release"
-} else {
-    DESTDIR="$$PWD/build/debug"
-}
-
-include($$PWD/GMP/GMP.pri)
-
-VERSION = 1.2.0
-
-HEADERS += \
-           qtsecret_global.h \
-           Qt-RSA/qrsaencryption.h
-
-SOURCES += \
-           Qt-RSA/qrsaencryption.cpp
-
-target.path = /usr/local/lib
-!isEmpty(target.path): INSTALLS += target