Changeset 846 for trunk/src/plugins/bearer
- Timestamp:
- May 5, 2011, 5:36:53 AM (15 years ago)
- Location:
- trunk
- Files:
-
- 1 edited
- 77 copied
-
. (modified) (1 prop)
-
src/plugins/bearer (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer )
-
src/plugins/bearer/bearer.pro (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/bearer.pro )
-
src/plugins/bearer/connman (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/connman )
-
src/plugins/bearer/connman/connman.pro (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/connman/connman.pro )
-
src/plugins/bearer/connman/main.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/connman/main.cpp )
-
src/plugins/bearer/connman/qconnmanengine.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/connman/qconnmanengine.cpp )
-
src/plugins/bearer/connman/qconnmanengine.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/connman/qconnmanengine.h )
-
src/plugins/bearer/connman/qconnmanservice_linux.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/connman/qconnmanservice_linux.cpp )
-
src/plugins/bearer/connman/qconnmanservice_linux_p.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/connman/qconnmanservice_linux_p.h )
-
src/plugins/bearer/connman/qofonoservice_linux.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/connman/qofonoservice_linux.cpp )
-
src/plugins/bearer/connman/qofonoservice_linux_p.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/connman/qofonoservice_linux_p.h )
-
src/plugins/bearer/corewlan (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/corewlan )
-
src/plugins/bearer/corewlan/corewlan.pro (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/corewlan/corewlan.pro )
-
src/plugins/bearer/corewlan/main.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/corewlan/main.cpp )
-
src/plugins/bearer/corewlan/qcorewlanengine.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/corewlan/qcorewlanengine.h )
-
src/plugins/bearer/corewlan/qcorewlanengine.mm (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/corewlan/qcorewlanengine.mm )
-
src/plugins/bearer/generic (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/generic )
-
src/plugins/bearer/generic/generic.pro (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/generic/generic.pro )
-
src/plugins/bearer/generic/main.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/generic/main.cpp )
-
src/plugins/bearer/generic/qgenericengine.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/generic/qgenericengine.cpp )
-
src/plugins/bearer/generic/qgenericengine.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/generic/qgenericengine.h )
-
src/plugins/bearer/icd (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/icd )
-
src/plugins/bearer/icd/dbusdispatcher.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/icd/dbusdispatcher.cpp )
-
src/plugins/bearer/icd/dbusdispatcher.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/icd/dbusdispatcher.h )
-
src/plugins/bearer/icd/iapconf.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/icd/iapconf.cpp )
-
src/plugins/bearer/icd/iapconf.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/icd/iapconf.h )
-
src/plugins/bearer/icd/iapmonitor.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/icd/iapmonitor.cpp )
-
src/plugins/bearer/icd/iapmonitor.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/icd/iapmonitor.h )
-
src/plugins/bearer/icd/icd.pro (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/icd/icd.pro )
-
src/plugins/bearer/icd/maemo_icd.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/icd/maemo_icd.cpp )
-
src/plugins/bearer/icd/maemo_icd.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/icd/maemo_icd.h )
-
src/plugins/bearer/icd/main.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/icd/main.cpp )
-
src/plugins/bearer/icd/proxyconf.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/icd/proxyconf.cpp )
-
src/plugins/bearer/icd/proxyconf.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/icd/proxyconf.h )
-
src/plugins/bearer/icd/qicdengine.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/icd/qicdengine.cpp )
-
src/plugins/bearer/icd/qicdengine.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/icd/qicdengine.h )
-
src/plugins/bearer/icd/qnetworksession_impl.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/icd/qnetworksession_impl.cpp )
-
src/plugins/bearer/icd/qnetworksession_impl.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/icd/qnetworksession_impl.h )
-
src/plugins/bearer/icd/wlan-utils.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/icd/wlan-utils.h )
-
src/plugins/bearer/nativewifi (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/nativewifi )
-
src/plugins/bearer/nativewifi/main.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/nativewifi/main.cpp )
-
src/plugins/bearer/nativewifi/nativewifi.pro (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/nativewifi/nativewifi.pro )
-
src/plugins/bearer/nativewifi/platformdefs.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/nativewifi/platformdefs.h )
-
src/plugins/bearer/nativewifi/qnativewifiengine.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/nativewifi/qnativewifiengine.cpp )
-
src/plugins/bearer/nativewifi/qnativewifiengine.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/nativewifi/qnativewifiengine.h )
-
src/plugins/bearer/networkmanager (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/networkmanager )
-
src/plugins/bearer/networkmanager/main.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/networkmanager/main.cpp )
-
src/plugins/bearer/networkmanager/networkmanager.pro (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/networkmanager/networkmanager.pro )
-
src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp )
-
src/plugins/bearer/networkmanager/qnetworkmanagerengine.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h )
-
src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp )
-
src/plugins/bearer/networkmanager/qnetworkmanagerservice.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/networkmanager/qnetworkmanagerservice.h )
-
src/plugins/bearer/networkmanager/qnmdbushelper.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/networkmanager/qnmdbushelper.cpp )
-
src/plugins/bearer/networkmanager/qnmdbushelper.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/networkmanager/qnmdbushelper.h )
-
src/plugins/bearer/nla (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/nla )
-
src/plugins/bearer/nla/main.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/nla/main.cpp )
-
src/plugins/bearer/nla/nla.pro (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/nla/nla.pro )
-
src/plugins/bearer/nla/qnlaengine.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/nla/qnlaengine.cpp )
-
src/plugins/bearer/nla/qnlaengine.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/nla/qnlaengine.h )
-
src/plugins/bearer/platformdefs_win.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/platformdefs_win.h )
-
src/plugins/bearer/qbearerengine_impl.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/qbearerengine_impl.h )
-
src/plugins/bearer/qnetworksession_impl.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/qnetworksession_impl.cpp )
-
src/plugins/bearer/qnetworksession_impl.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/qnetworksession_impl.h )
-
src/plugins/bearer/symbian (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/symbian )
-
src/plugins/bearer/symbian/3_1 (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/symbian/3_1 )
-
src/plugins/bearer/symbian/3_1/3_1.pro (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/symbian/3_1/3_1.pro )
-
src/plugins/bearer/symbian/3_2 (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/symbian/3_2 )
-
src/plugins/bearer/symbian/3_2/3_2.pro (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/symbian/3_2/3_2.pro )
-
src/plugins/bearer/symbian/main.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/symbian/main.cpp )
-
src/plugins/bearer/symbian/qnetworksession_impl.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/symbian/qnetworksession_impl.cpp )
-
src/plugins/bearer/symbian/qnetworksession_impl.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/symbian/qnetworksession_impl.h )
-
src/plugins/bearer/symbian/symbian.pri (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/symbian/symbian.pri )
-
src/plugins/bearer/symbian/symbian.pro (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/symbian/symbian.pro )
-
src/plugins/bearer/symbian/symbian_3 (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/symbian/symbian_3 )
-
src/plugins/bearer/symbian/symbian_3/symbian_3.pro (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/symbian/symbian_3/symbian_3.pro )
-
src/plugins/bearer/symbian/symbianengine.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/symbian/symbianengine.cpp )
-
src/plugins/bearer/symbian/symbianengine.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/plugins/bearer/symbian/symbianengine.h )
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.7.2 (added) merged: 845 /branches/vendor/nokia/qt/current merged: 844 /branches/vendor/nokia/qt/4.6.3 removed
- Property svn:mergeinfo changed
Note:
See TracChangeset
for help on using the changeset viewer.
