diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-02-24 04:16:04 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-02-24 04:16:04 (GMT) |
| commit | 6680766bcdd5bff7f1a871c711202a30fe91e25e (patch) | |
| tree | 668400393f44d7abf6099bb1ce78d431902e1b63 /src/network/network.pro | |
| parent | d3e494b78a00a8109005b2c86605920799ad12c8 (diff) | |
| parent | 4d615766184e3eeee25ffc634847bec1edd47ac0 (diff) | |
| download | Qt-6680766bcdd5bff7f1a871c711202a30fe91e25e.zip Qt-6680766bcdd5bff7f1a871c711202a30fe91e25e.tar.gz Qt-6680766bcdd5bff7f1a871c711202a30fe91e25e.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
configure
Diffstat (limited to 'src/network/network.pro')
| -rw-r--r-- | src/network/network.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/network/network.pro b/src/network/network.pro index e890b94..8582d8a 100644 --- a/src/network/network.pro +++ b/src/network/network.pro @@ -17,6 +17,7 @@ unix:QMAKE_PKGCONFIG_REQUIRES = QtCore include(../qbase.pri) include(access/access.pri) +include(bearer/bearer.pri) include(kernel/kernel.pri) include(socket/socket.pri) include(ssl/ssl.pri) |