Port to Qt 5

maksbotan · Dec 20, 2017 · 0023fca · 0023fca
1 parent 37d0ddb
commit 0023fca
Show file tree

Hide file tree

Showing 173 changed files with 79,562 additions and 51 deletions.
diff --git a/bin/fingerprint-gui/fingerprint-gui.pro b/bin/fingerprint-gui/fingerprint-gui.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 CONFIG += qt thread crypto
 TARGET = fingerprint-gui
-QT += xml
+QT += xml widgets
 DEPENDPATH += . ../../include ../../src
 INCLUDEPATH += . ../../include ../../upek/include
 

diff --git a/bin/fingerprint-helper/fingerprint-helper.pro b/bin/fingerprint-helper/fingerprint-helper.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 CONFIG += qt thread crypto
 TARGET = fingerprint-helper
-QT += xml
+QT += xml widgets x11extras
 DEPENDPATH += . ../../include ../../src
 INCLUDEPATH += . ../../include ../../upek/include
 

diff --git a/bin/fingerprint-identifier/fingerprint-identifier.pro b/bin/fingerprint-identifier/fingerprint-identifier.pro
@@ -3,6 +3,7 @@ CONFIG += qt thread
 TARGET = fingerprint-identifier
 DEPENDPATH += . ../../include ../../src
 INCLUDEPATH += . ../../include ../../upek/include
+QT += widgets
 
 isEmpty(PREFIX) {
 	PREFIX = /usr/local

diff --git a/bin/fingerprint-pam/fingerprint-pam.pro b/bin/fingerprint-pam/fingerprint-pam.pro
@@ -3,6 +3,7 @@ CONFIG = plugin
 TARGET = pam_fingerprint-gui
 DEPENDPATH += . ../../include ../../src
 INCLUDEPATH += . ../../include ../../upek/include
+QT += widgets x11extras
 
 isEmpty(PREFIX) {
 	PREFIX = /usr/local

diff --git a/bin/fingerprint-plugin/fingerprint-plugin.pro b/bin/fingerprint-plugin/fingerprint-plugin.pro
@@ -3,6 +3,7 @@ CONFIG += qt thread
 TARGET = fingerprint-plugin
 DEPENDPATH += . ../../include ../../src
 INCLUDEPATH += . ../../include ../../upek/include
+QT += widgets
 
 isEmpty(PREFIX) {
 	PREFIX = /usr/local

diff --git a/bin/fingerprint-polkit-agent/fingerprint-polkit-agent.pro b/bin/fingerprint-polkit-agent/fingerprint-polkit-agent.pro
@@ -3,6 +3,7 @@ CONFIG += qt thread
 TARGET = fingerprint-polkit-agent
 DEPENDPATH += . ../../include ../../src
 INCLUDEPATH += . ../../include ../../upek/include
+QT += widgets
 
 isEmpty(PREFIX) {
     PREFIX = /usr/local
@@ -27,7 +28,7 @@ INSTALLS += target desktop
 DEFINES +=LIBEXECDIR=\\\"$${LIBEXECDIR}\\\"
 QMAKE_CXXFLAGS+=-fno-strict-aliasing
 
-LIBS += -lusb-1.0 -lfprint -lX11 -lpolkit-qt-agent-1 -lpolkit-qt-core-1
+LIBS += -lusb-1.0 -lfprint -lX11 -lpolkit-qt5-agent-1 -lpolkit-qt5-core-1
 
 # Input
 HEADERS += \

diff --git a/build/.qmake.stash b/build/.qmake.stash
@@ -0,0 +1,23 @@
+QMAKE_CXX.INCDIRS = \
+    /usr/lib/gcc/x86_64-pc-linux-gnu/7.2.0/include/g++-v7 \
+    /usr/lib/gcc/x86_64-pc-linux-gnu/7.2.0/include/g++-v7/x86_64-pc-linux-gnu \
+    /usr/lib/gcc/x86_64-pc-linux-gnu/7.2.0/include/g++-v7/backward \
+    /usr/lib/gcc/x86_64-pc-linux-gnu/7.2.0/include \
+    /usr/lib/gcc/x86_64-pc-linux-gnu/7.2.0/include-fixed \
+    /usr/include
+QMAKE_CXX.LIBDIRS = \
+    /usr/lib/gcc/x86_64-pc-linux-gnu/7.2.0 \
+    /usr/lib64 \
+    /lib64 \
+    /usr/x86_64-pc-linux-gnu/lib \
+    /usr/lib \
+    /lib
+QMAKE_CXX.QT_COMPILER_STDCXX = 201402L
+QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7
+QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 2
+QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 0
+QMAKE_CXX.COMPILER_MACROS = \
+    QT_COMPILER_STDCXX \
+    QMAKE_GCC_MAJOR_VERSION \
+    QMAKE_GCC_MINOR_VERSION \
+    QMAKE_GCC_PATCH_VERSION
diff --git a/build/Makefile b/build/Makefile
diff --git a/build/bin/Makefile b/build/bin/Makefile
diff --git a/build/bin/fingerprint-gui/AboutImpl.o b/build/bin/fingerprint-gui/AboutImpl.o
diff --git a/build/bin/fingerprint-gui/DeviceHandler.o b/build/bin/fingerprint-gui/DeviceHandler.o
diff --git a/build/bin/fingerprint-gui/ExistDialogImpl.o b/build/bin/fingerprint-gui/ExistDialogImpl.o
diff --git a/build/bin/fingerprint-gui/Fingerprint.o b/build/bin/fingerprint-gui/Fingerprint.o
diff --git a/build/bin/fingerprint-gui/FingerprintData.o b/build/bin/fingerprint-gui/FingerprintData.o
diff --git a/build/bin/fingerprint-gui/FingerprintGUI.o b/build/bin/fingerprint-gui/FingerprintGUI.o
diff --git a/build/bin/fingerprint-gui/GenericDevice.o b/build/bin/fingerprint-gui/GenericDevice.o
diff --git a/build/bin/fingerprint-gui/GlobalsImg.o b/build/bin/fingerprint-gui/GlobalsImg.o
diff --git a/build/bin/fingerprint-gui/MainWindowImpl.o b/build/bin/fingerprint-gui/MainWindowImpl.o