summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPekka Vuorela <pvuorela@iki.fi>2024-03-03 21:14:38 +0200
committerPekka Vuorela <pvuorela@iki.fi>2024-03-31 18:30:13 +0200
commit70702bfb9c3f0efec270a4825cea53db3472005c (patch)
tree2405bb65703111222524219b7c0f689a0cff7788
parenta440eab5188398cf0c23fa8718396138d864db18 (diff)
Remove cruft from some .pro files and remove pointless common.pri
messageserver.pri not used anywhere. Neither PLUGIN_INTERNAL definition is no longer used anywhere. The common.pri isn't too good a common file as it's mostly included outside the src tree, only src/tools/messageserver uses it from the actual sources. Hence removing QMF_ENABLE_LOGGING shouldn't affect anything since it's used only in the libqmfclient for one thing. To use that properly one has needed the definition value passed externally. The win/mac special case release mode I didn't understand too well and neither did qtbase run_pro2cmake.py I was testing to proceed with cmake build. Unsure was that CONFIG_WIN working even in qt5 or was that some earlier thing. The mac bundle would have been used only for unit tests and such, so feels pointless. As neither target now even works because of d-bus ipc, let's just remove this part. Removing these makes the common.pri even more pointless so just moved the INSTALL=target to few places that were using the common.pri Change-Id: Ibfe6da554e0d452e09d08e184e22508c1af958e0 Reviewed-by: Damien Caliste <dcaliste@free.fr> Reviewed-by: Christopher Adams <chris.adams@qinetic.com.au>
Diffstat
-rw-r--r--benchmarks/tst_messageserver/tst_messageserver.pro8
-rw-r--r--common.pri82
-rw-r--r--examples/listfilterplugin/listfilterplugin.pro4
-rw-r--r--examples/messagingaccounts/messagingaccounts.pro3
-rw-r--r--examples/qtmail/qtmail.pro3
-rw-r--r--examples/serverobserver/serverobserver.pro3
-rw-r--r--src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro2
-rw-r--r--src/tools/messageserver/messageserver.pri22
-rw-r--r--src/tools/messageserver/messageserver.pro2
-rw-r--r--tests/tests.pri3
10 files changed, 9 insertions, 123 deletions
diff --git a/benchmarks/tst_messageserver/tst_messageserver.pro b/benchmarks/tst_messageserver/tst_messageserver.pro
index 2d50131a..a389e4ae 100644
--- a/benchmarks/tst_messageserver/tst_messageserver.pro
+++ b/benchmarks/tst_messageserver/tst_messageserver.pro
@@ -4,14 +4,8 @@ QT += testlib widgets qmfclient qmfclient-private qmfmessageserver
TARGET = tst_messageserver
target.path += $$QMF_INSTALL_ROOT/tests5
-BASE=../../
-include($$BASE/common.pri)
-
-
DEPENDPATH += . 3rdparty
-DEFINES += PLUGIN_STATIC_LINK
-
!win32 {
DEFINES += HAVE_VALGRIND
}
@@ -48,4 +42,4 @@ linux {
SOURCES += testmalloc.cpp
}
-
+INSTALLS += target
diff --git a/common.pri b/common.pri
deleted file mode 100644
index c690ce66..00000000
--- a/common.pri
+++ /dev/null
@@ -1,82 +0,0 @@
-CONFIG(debug,debug|release) {
- DEFINES += QMF_ENABLE_LOGGING
-}
-
-
-win32 | macx {
-
- RELEASEMODE=unspecified
-
- !build_pass {
-
- win32 {
- contains(CONFIG_WIN,debug) {
- RELEASEMODE=debug
- } else:contains(CONFIG_WIN,release) {
- RELEASEMODE=release
- }
- }
-
- # In Windows we want to build libraries in debug and release mode if the user
- # didn't select a version, and if Qt is built in debug_and_release.
- # This avoids problems for third parties as qmake builds debug mode by default
- # Silently disable unsupported configurations
-
- # MacOSX always builds debug and release libs when using mac framework
-
- CONFIG -= debug release debug_and_release build_all
-
- contains(RELEASEMODE,unspecified) {
- contains(QT_CONFIG,debug):contains(QT_CONFIG,release) | if(macx:contains(QT_CONFIG,qt_framework):contains(TEMPLATE,.*lib)) {
- CONFIG += debug_and_release build_all
- } else {
- contains(QT_CONFIG,debug): CONFIG+=debug
- contains(QT_CONFIG,release): CONFIG+=release
- }
- } else {
- CONFIG += $$RELEASEMODE
- }
- }
-
-
-
- #suffix changes
-
- contains(TEMPLATE,.*lib) {
- TARGET=$$qtLibraryTarget($${TARGET})
- }
-
- win32 {
- contains(TEMPLATE,.*app) {
- CONFIG(debug,debug|release):TARGET=$$join(TARGET,,,d)
- }
-
- # If we are building both debug and release configuration, ensure
- # debug binaries load debug versions of their dependents
-
- CONFIG(debug,debug|release) {
- DEFINES += LOAD_DEBUG_VERSION
- }
- }
-
-}
-
-INSTALLS += target
-
-DESTDIR=build
-
-plugin {
- DEFINES += PLUGIN_INTERNAL
-}
-
-# build QMF libraries as frameworks on OSX, omitting plugins.
-
-mac:contains(QT_CONFIG,qt_framework):!plugin {
- CONFIG += lib_bundle absolute_library_soname
- FRAMEWORK_HEADERS.version = Versions
- FRAMEWORK_HEADERS.files = $${PUBLIC_HEADERS}
- FRAMEWORK_HEADERS.path = Headers
- QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
-}
-
-CONFIG += hide_symbols
diff --git a/examples/listfilterplugin/listfilterplugin.pro b/examples/listfilterplugin/listfilterplugin.pro
index f6ae3ba7..a600475a 100644
--- a/examples/listfilterplugin/listfilterplugin.pro
+++ b/examples/listfilterplugin/listfilterplugin.pro
@@ -5,8 +5,6 @@ QT = core
target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/contentmanagers
-DEFINES += PLUGIN_INTERNAL
-
DEPENDPATH += .
INCLUDEPATH += . ../../src/libraries/qmfclient \
@@ -19,4 +17,4 @@ HEADERS += listfilterplugin.h
SOURCES += listfilterplugin.cpp
-include(../../common.pri)
+INSTALLS += target
diff --git a/examples/messagingaccounts/messagingaccounts.pro b/examples/messagingaccounts/messagingaccounts.pro
index b251a7b8..eaccaafe 100644
--- a/examples/messagingaccounts/messagingaccounts.pro
+++ b/examples/messagingaccounts/messagingaccounts.pro
@@ -19,5 +19,6 @@ SOURCES += $$QTMAIL_EXAMPLE/accountsettings.cpp \
RESOURCES += messagingaccounts.qrc
-include(../../common.pri)
+INSTALLS += target
+
CONFIG += install_ok
diff --git a/examples/qtmail/qtmail.pro b/examples/qtmail/qtmail.pro
index 1e411368..7a8c1e11 100644
--- a/examples/qtmail/qtmail.pro
+++ b/examples/qtmail/qtmail.pro
@@ -53,6 +53,5 @@ SOURCES += emailclient.cpp \
FORMS += searchviewbasephone.ui
RESOURCES += qtmail.qrc
-
-include(../../common.pri)
+INSTALLS += target
CONFIG += install_ok
diff --git a/examples/serverobserver/serverobserver.pro b/examples/serverobserver/serverobserver.pro
index b69c40f8..18fb3b06 100644
--- a/examples/serverobserver/serverobserver.pro
+++ b/examples/serverobserver/serverobserver.pro
@@ -8,5 +8,6 @@ HEADERS += serverobserver.h
SOURCES += serverobserver.cpp \
main.cpp
-include(../../common.pri)
+INSTALLS += target
+
CONFIG += install_ok
diff --git a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro
index a60b7ac4..60fdd366 100644
--- a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro
+++ b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro
@@ -5,8 +5,6 @@ PLUGIN_CLASS_NAME = QmfStorageManagerPlugin
load(qt_plugin)
QT = core qmfclient
-DEFINES += PLUGIN_INTERNAL
-
HEADERS += qmfstoragemanager.h
SOURCES += qmfstoragemanager.cpp
diff --git a/src/tools/messageserver/messageserver.pri b/src/tools/messageserver/messageserver.pri
deleted file mode 100644
index 2abc9ae3..00000000
--- a/src/tools/messageserver/messageserver.pri
+++ /dev/null
@@ -1,22 +0,0 @@
-QTOPIA*=mail
-MODULES*=messageserver
-
-enable_cell:contains(PROJECTS,libraries/qtopiasmil):CONFIG+=enable_mms
-else:DEFINES+=QTOPIA_NO_SMS QTOPIA_NO_MMS
-
-!enable_telephony:DEFINES+=QTOPIA_NO_COLLECTIVE
-
-HEADERS=\
- servicehandler.h\
- messageserverDBusAdaptor.h\
- messageserver.h\
- newcountnotifier.h
-
-SOURCES=\
- servicehandler.cpp\
- messageserverDBusAdaptor.cpp\
- messageserver.cpp\
- prepareaccounts.cpp\
- newcountnotifier.cpp\
- main.cpp
-
diff --git a/src/tools/messageserver/messageserver.pro b/src/tools/messageserver/messageserver.pro
index 9ab48893..349d5a17 100644
--- a/src/tools/messageserver/messageserver.pro
+++ b/src/tools/messageserver/messageserver.pro
@@ -51,4 +51,4 @@ TRANSLATIONS += messageserver-ar.ts \
messageserver-zh_CN.ts \
messageserver-zh_TW.ts
-include(../../../common.pri)
+INSTALLS += target
diff --git a/tests/tests.pri b/tests/tests.pri
index 623b19ca..11065508 100644
--- a/tests/tests.pri
+++ b/tests/tests.pri
@@ -5,5 +5,4 @@ CONFIG += testcase
QT += qmfclient qmfclient-private
target.path += $$QMF_INSTALL_ROOT/tests5
-include(../common.pri)
-
+INSTALLS += target
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-15 09:28:24 +0000