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