diff options
| -rw-r--r-- | src/bearer/bearer.pro | 4 | ||||
| -rw-r--r-- | src/bearer/bearer_old/bearer_old.pro | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/bearer/bearer.pro b/src/bearer/bearer.pro index 78ca79bc07..adaceb22fa 100644 --- a/src/bearer/bearer.pro +++ b/src/bearer/bearer.pro @@ -5,10 +5,6 @@ TARGET = QtBearer QT += network include (../../common.pri) -DEFINES += QT_BUILD_BEARER_LIB QT_MAKEDLL - -#DEFINES += BEARER_MANAGEMENT_DEBUG - PUBLIC_HEADERS += qnetworkconfiguration.h \ qnetworksession.h \ qnetworkconfigmanager.h diff --git a/src/bearer/bearer_old/bearer_old.pro b/src/bearer/bearer_old/bearer_old.pro index b8859f5fcb..ac988c76ef 100644 --- a/src/bearer/bearer_old/bearer_old.pro +++ b/src/bearer/bearer_old/bearer_old.pro @@ -7,16 +7,20 @@ message("Building QtBearer 10.0 to support version conflict in Symbian") VPATH += .. -include (../../../common.pri) -include (../bearer.pri) - - HEADERS += qnetworkconfiguration.h \ qnetworksession.h \ qnetworkconfigmanager.h - + +include (../../../common.pri) +include (../bearer.pri) symbian { + + # there are same name public headers from Qt + # and this needs to be added to ensure QtBearer + # uses its own when the 10.0 version is compiled + MMP_RULES += "USERINCLUDE .." + CONFIG += def_files_disabled MMP_RULES += defBlock defBlock = \ |