More consistency fixes to plugins project files

psi-im · Jul 29, 2017 · 92e9d74 · 92e9d74
1 parent cb75d5c
commit 92e9d74
Show file tree

Hide file tree

Showing 32 changed files with 38 additions and 60 deletions.
diff --git a/generic/attentionplugin/attentionplugin.pro b/generic/attentionplugin/attentionplugin.pro
@@ -1,10 +1,10 @@
-CONFIG += release
-RESOURCES = attentionplugin.qrc
-
 isEmpty(PSISDK) {
     include(../../psiplugin.pri)
 } else {
     include($$PSISDK/plugins/psiplugin.pri)
 }
+
+RESOURCES = attentionplugin.qrc
+
 SOURCES += attentionplugin.cpp
 FORMS += options.ui
diff --git a/generic/autoreplyplugin/autoreplyplugin.pro b/generic/autoreplyplugin/autoreplyplugin.pro
@@ -1,5 +1,3 @@
-CONFIG += release
-
 isEmpty(PSISDK) {
     include(../../psiplugin.pri)
 } else {

diff --git a/generic/birthdayreminderplugin/birthdayreminderplugin.pro b/generic/birthdayreminderplugin/birthdayreminderplugin.pro
@@ -1,4 +1,3 @@
-CONFIG += release
 isEmpty(PSISDK) {
     include(../../psiplugin.pri)
 } else {

diff --git a/generic/chessplugin/chessplugin.pro b/generic/chessplugin/chessplugin.pro
@@ -1,10 +1,11 @@
-CONFIG += release
-RESOURCES = chessplugin.qrc
 isEmpty(PSISDK) {
     include(../../psiplugin.pri)
 } else {
     include($$PSISDK/plugins/psiplugin.pri)
 }
+
+RESOURCES = chessplugin.qrc
+
 INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
 SOURCES += chessplugin.cpp \

diff --git a/generic/cleanerplugin/cleanerplugin.pro b/generic/cleanerplugin/cleanerplugin.pro
@@ -1,4 +1,3 @@
-CONFIG += release
 isEmpty(PSISDK) {
     include(../../psiplugin.pri)
 } else {

diff --git a/generic/clientswitcherplugin/clientswitcherplugin.pro b/generic/clientswitcherplugin/clientswitcherplugin.pro
@@ -1,4 +1,3 @@
-CONFIG += release
 isEmpty(PSISDK) {
     include(../../psiplugin.pri)
 } else {

diff --git a/generic/conferenceloggerplugin/conferenceloggerplugin.pro b/generic/conferenceloggerplugin/conferenceloggerplugin.pro
@@ -1,10 +1,11 @@
-CONFIG += release
-RESOURCES = conferenceloggerplugin.qrc
 isEmpty(PSISDK) {
     include(../../psiplugin.pri)
 } else {
     include($$PSISDK/plugins/psiplugin.pri)
 }
+
+RESOURCES = conferenceloggerplugin.qrc
+
 SOURCES += conferenceloggerplugin.cpp \
     typeaheadfind.cpp \
     viewer.cpp

diff --git a/generic/contentdownloaderplugin/contentdownloaderplugin.pro b/generic/contentdownloaderplugin/contentdownloaderplugin.pro
@@ -1,13 +1,11 @@
-# -------------------------------------------------
-# Project created by QtCreator 2010-08-20T17:55:47
-# -------------------------------------------------
-QT += network xml
-# CONFIG += debug
 isEmpty(PSISDK) {
     include(../../psiplugin.pri)
 } else {
     include($$PSISDK/plugins/psiplugin.pri)
 }
+
+QT += network xml
+
 SOURCES += contentdownloader.cpp \
     cditemmodel.cpp \
     form.cpp \

diff --git a/generic/enummessagesplugin/enummessagesplugin.pro b/generic/enummessagesplugin/enummessagesplugin.pro
@@ -1,4 +1,3 @@
-CONFIG += release
 isEmpty(PSISDK) {
     include(../../psiplugin.pri)
 } else {

diff --git a/generic/extendedmenuplugin/extendedmenuplugin.pro b/generic/extendedmenuplugin/extendedmenuplugin.pro
@@ -1,5 +1,3 @@
-CONFIG += release
-
 isEmpty(PSISDK) {
     include(../../psiplugin.pri)
 } else {

diff --git a/generic/extendedoptionsplugin/extendedoptionsplugin.pro b/generic/extendedoptionsplugin/extendedoptionsplugin.pro
@@ -1,4 +1,3 @@
-CONFIG += release
 isEmpty(PSISDK) {
     include(../../psiplugin.pri)
 } else {

diff --git a/generic/gnupgplugin/gnupg.h b/generic/gnupgplugin/gnupg.h
@@ -98,7 +98,7 @@ class GnuPG : public QObject
 
 	// from ToolbarIconAccessor
 	QList<QVariantHash> getButtonParam();
-	QAction* getAction(QObject */*parent*/, int /*account*/, const QString &/*contact*/) { return 0; }
+	QAction* getAction(QObject * /*parent*/, int /*account*/, const QString &/*contact*/) { return 0; }
 
 	// from IconFactoryAccessor
 	void setIconFactoryAccessingHost(IconFactoryAccessingHost *host) { _iconFactory = host; }

diff --git a/generic/gnupgplugin/gnupgplugin.pro b/generic/gnupgplugin/gnupgplugin.pro
@@ -1,4 +1,3 @@
-CONFIG += release
 isEmpty(PSISDK) {
     include(../../psiplugin.pri)
 } else {
@@ -27,3 +26,5 @@ FORMS   += options.ui \
            addkeydlg.ui
 
 RESOURCES += resources.qrc
+
+win32:LIBS += -ladvapi32
diff --git a/generic/gomokugameplugin/gomokugameplugin.pro b/generic/gomokugameplugin/gomokugameplugin.pro
@@ -1,4 +1,3 @@
-CONFIG += release
 isEmpty(PSISDK) {
     include(../../psiplugin.pri)
 } else {

diff --git a/generic/historykeeperplugin/historykeeperplugin.pro b/generic/historykeeperplugin/historykeeperplugin.pro
@@ -1,4 +1,3 @@
-CONFIG += release
 isEmpty(PSISDK) {
     include(../../psiplugin.pri)
 } else {

diff --git a/generic/httpuploadplugin/httpuploadplugin.pro b/generic/httpuploadplugin/httpuploadplugin.pro
@@ -1,18 +1,18 @@
-#CONFIG += release
-QT += network
-greaterThan(QT_MAJOR_VERSION, 4) {
-    CONFIG += c++11
-}
 isEmpty(PSISDK) {
     include(../../psiplugin.pri)
 } else {
     include($$PSISDK/plugins/psiplugin.pri)
 }
 
+QT += network
+greaterThan(QT_MAJOR_VERSION, 4) {
+    CONFIG += c++11
+}
+
 RESOURCES = httpuploadplugin.qrc
 
 SOURCES += httpuploadplugin.cpp \
 		   uploadservice.cpp \
 		   previewfiledialog.cpp \
 
-HEADERS += previewfiledialog.h
+HEADERS += previewfiledialog.h
diff --git a/generic/icqdieplugin/icqdieplugin.pro b/generic/icqdieplugin/icqdieplugin.pro
@@ -1,4 +1,3 @@
-CONFIG += release
 isEmpty(PSISDK) {
     include(../../psiplugin.pri)
 } else {

diff --git a/generic/imageplugin/imageplugin.pro b/generic/imageplugin/imageplugin.pro
@@ -1,5 +1,3 @@
-#CONFIG += release
-
 isEmpty(PSISDK) {
     include(../../psiplugin.pri)
 } else {

diff --git a/generic/imagepreviewplugin/imagepreviewplugin.pro b/generic/imagepreviewplugin/imagepreviewplugin.pro
@@ -1,4 +1,9 @@
-CONFIG += release
+isEmpty(PSISDK) {
+    include(../../psiplugin.pri)
+} else {
+    include($$PSISDK/plugins/psiplugin.pri)
+}
+
 QT += network
 greaterThan(QT_MAJOR_VERSION, 4) {
     qtHaveModule(webengine) {
@@ -15,12 +20,6 @@ else {
     DEFINES += HAVE_WEBKIT
 }
 
-isEmpty(PSISDK) {
-    include(../../psiplugin.pri)
-} else {
-    include($$PSISDK/plugins/psiplugin.pri)
-}
-
 RESOURCES = imagepreviewplugin.qrc
 
 SOURCES += imagepreviewplugin.cpp \

diff --git a/generic/jabberdiskplugin/jabberdiskplugin.pro b/generic/jabberdiskplugin/jabberdiskplugin.pro
@@ -1,4 +1,3 @@
-CONFIG += release
 isEmpty(PSISDK) {
     include(../../psiplugin.pri)
 } else {

diff --git a/generic/juickplugin/juickplugin.pro b/generic/juickplugin/juickplugin.pro
@@ -1,8 +1,11 @@
-CONFIG += release
-include(../../psiplugin.pri)
+isEmpty(PSISDK) {
+    include(../../psiplugin.pri)
+} else {
+    include($$PSISDK/plugins/psiplugin.pri)
+}
 
 SOURCES += \
-            juickplugin.cpp \
+    juickplugin.cpp \
     juickjidlist.cpp \
     juickparser.cpp \
     juickdownloader.cpp
@@ -14,7 +17,7 @@ HEADERS += \
     defines.h \
     juickplugin.h
 
-QT += network
+QT += network widgets
 greaterThan(QT_MAJOR_VERSION, 4) {
     contains(psi_features, qtwebengine) {
         QT += webengine webenginewidgets

diff --git a/generic/messagefilterplugin/messagefilterplugin.pro b/generic/messagefilterplugin/messagefilterplugin.pro
@@ -1,4 +1,3 @@
-CONFIG += release
 isEmpty(PSISDK) {
     include(../../psiplugin.pri)
 } else {

diff --git a/generic/otrplugin/otrplugin.pro b/generic/otrplugin/otrplugin.pro
@@ -1,4 +1,3 @@
-CONFIG += release
 isEmpty(PSISDK) {
     include(../../psiplugin.pri)
 } else {

diff --git a/generic/pepchangenotifyplugin/pepchangenotifyplugin.pro b/generic/pepchangenotifyplugin/pepchangenotifyplugin.pro
@@ -1,4 +1,3 @@
-CONFIG += release
 isEmpty(PSISDK) {
     include(../../psiplugin.pri)
 } else {

diff --git a/generic/qipxstatusesplugin/qipxstatusesplugin.pro b/generic/qipxstatusesplugin/qipxstatusesplugin.pro
@@ -1,5 +1,3 @@
-CONFIG += release
-
 isEmpty(PSISDK) {
     include(../../psiplugin.pri)
 } else {

diff --git a/generic/screenshotplugin/screenshotplugin.pro b/generic/screenshotplugin/screenshotplugin.pro
@@ -3,7 +3,7 @@ isEmpty(PSISDK) {
 } else {
     include($$PSISDK/plugins/psiplugin.pri)
 }
-CONFIG += release
+
 QT += network
 greaterThan(QT_MAJOR_VERSION, 4) {
   QT += printsupport

diff --git a/generic/skinsplugin/skinsplugin.pro b/generic/skinsplugin/skinsplugin.pro
@@ -1,4 +1,3 @@
-CONFIG += release
 isEmpty(PSISDK) {
     include(../../psiplugin.pri)
 } else {

diff --git a/generic/stopspamplugin/stopspamplugin.pro b/generic/stopspamplugin/stopspamplugin.pro
@@ -1,4 +1,3 @@
-CONFIG += release
 TARGET = stopspamplugin
 isEmpty(PSISDK) {
     include(../../psiplugin.pri)

diff --git a/generic/storagenotesplugin/storagenotesplugin.pro b/generic/storagenotesplugin/storagenotesplugin.pro
@@ -1,4 +1,3 @@
-CONFIG += release
 isEmpty(PSISDK) {
     include(../../psiplugin.pri)
 } else {

diff --git a/generic/translateplugin/translateplugin.pro b/generic/translateplugin/translateplugin.pro
@@ -1,4 +1,3 @@
-CONFIG += release
 isEmpty(PSISDK) {
     include(../../psiplugin.pri)
 } else {

diff --git a/generic/videostatusplugin/videostatusplugin.pro b/generic/videostatusplugin/videostatusplugin.pro
@@ -1,11 +1,11 @@
-!mac {
-CONFIG += release
 isEmpty(PSISDK) {
     include(../../psiplugin.pri)
 } else {
     include($$PSISDK/plugins/psiplugin.pri)
 }
 
+!mac {
+
 RESOURCES += resources.qrc
 
 SOURCES += videostatusplugin.cpp
@@ -20,4 +20,4 @@ unix: ! mac {
     HEADERS += x11info.h
 }
 
-win32:LIBS += -lUser32
+win32:LIBS += -luser32
diff --git a/generic/watcherplugin/watcherplugin.pro b/generic/watcherplugin/watcherplugin.pro
@@ -1,4 +1,3 @@
-CONFIG += release
 isEmpty(PSISDK) {
     include(../../psiplugin.pri)
 } else {