Reorginize the structure of QGlobalShortcut part.

Legotckoi · Apr 21, 2016 · fc5af4b · fc5af4b
1 parent 9169001
commit fc5af4b
Show file tree

Hide file tree

Showing 8 changed files with 554 additions and 6 deletions.
diff --git a/src/QGlobalShortcut/AUTHORS b/src/QGlobalShortcut/AUTHORS
@@ -0,0 +1 @@
+Authors: Evgenii Legotckoi
diff --git a/src/QGlobalShortcut/LICENSE b/src/QGlobalShortcut/LICENSE
diff --git a/src/QGlobalShortcut/README.md b/src/QGlobalShortcut/README.md
@@ -0,0 +1,18 @@
+# QGlobalShortcut
+Crossplatform Global HotKey for Qt5.1 and higher
+
+# Configuration of PRO File
+```
+CONFIG += c++11
+
+linux {
+    QT       += x11extras
+    CONFIG   += link_pkgconfig
+    PKGCONFIG += x11
+}
+
+win32: SOURCES += win/qglobalshortcut.cpp
+linux: SOURCES += x11/qglobalshortcut.cpp
+
+HEADERS  += qglobalshortcut.h
+```
diff --git a/src/qglobalshortcut.h → src/QGlobalShortcut/qglobalshortcut.h b/src/qglobalshortcut.h → src/QGlobalShortcut/qglobalshortcut.h
diff --git a/src/QGlobalShortcut/qglobalshortcut.pri b/src/QGlobalShortcut/qglobalshortcut.pri
@@ -0,0 +1,25 @@
+
+INCLUDEPATH += $$PWD
+
+CONFIG += c++11
+
+linux {
+    QT       += x11extras
+    CONFIG   += link_pkgconfig
+    PKGCONFIG += x11
+}
+
+win32-mingw{
+    QMAKE_CXXFLAGS += -Wliteral-suffix
+}
+win32-msvc*{
+    LIBS += -luser32
+}
+
+HEADERS += \
+    $$PWD/qglobalshortcut.h
+
+win32: SOURCES += $$PWD/win/qglobalshortcut.cpp
+linux: SOURCES += $$PWD/x11/qglobalshortcut.cpp
+
+
diff --git a/src/win/qglobalshortcut.cpp → src/QGlobalShortcut/win/qglobalshortcut.cpp b/src/win/qglobalshortcut.cpp → src/QGlobalShortcut/win/qglobalshortcut.cpp
diff --git a/src/x11/qglobalshortcut.cpp → src/QGlobalShortcut/x11/qglobalshortcut.cpp b/src/x11/qglobalshortcut.cpp → src/QGlobalShortcut/x11/qglobalshortcut.cpp
diff --git a/src/src.pro b/src/src.pro
@@ -25,7 +25,7 @@ win32-msvc*{
 
 VER_MAJ = 0
 VER_MIN = 1
-VER_PAT = 6
+VER_PAT = 7
 
 VERSION = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} # major.minor.patch
 
@@ -61,9 +61,6 @@ SOURCES += main.cpp\
     gradationlabel.cpp \
     popupcolorstylesheethelper.cpp
 
-win32: SOURCES += win/qglobalshortcut.cpp
-linux: SOURCES += x11/qglobalshortcut.cpp
-
 HEADERS  += \
     about.h \
     settings.h \
@@ -75,8 +72,9 @@ HEADERS  += \
     popupmessage.h \
     transparentwindow.h \
     gradationlabel.h \
-    popupcolorstylesheethelper.h \
-    qglobalshortcut.h
+    popupcolorstylesheethelper.h
+
+include(QGlobalShortcut/qglobalshortcut.pri)
 
 FORMS    += \
     about.ui \
@@ -85,3 +83,5 @@ FORMS    += \
 
 RESOURCES += \
     images.qrc
+
+DISTFILES +=