diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-30 00:21:46 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-30 00:21:46 (GMT) |
| commit | 856711caba2736ca9330f086635b418322462c3a (patch) | |
| tree | 9f2b40f9899813a331f2114cc7770c46f127dab1 /src/plugins | |
| parent | 967afc717ffd411e22ce94de77cf54284815b27e (diff) | |
| parent | 1cb7e3503a907719aebb98096c302a8327e9804d (diff) | |
| download | Qt-856711caba2736ca9330f086635b418322462c3a.zip Qt-856711caba2736ca9330f086635b418322462c3a.tar.gz Qt-856711caba2736ca9330f086635b418322462c3a.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Add autotest for QScriptExtensionPlugin
Improve QtScript test coverage
Don't crash when null-pointer is passed to qScriptValueFromValue()
Simplify object lifetime management when moving objects to a QThread
samegame: white space
Move list of trusted benchmarks out of QA dungeon and into Qt
Don't put Objective-C sources in SOURCES
mkspecs: Emit warning when including g++.conf directly
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/bearer/corewlan/corewlan.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/bearer/corewlan/corewlan.pro b/src/plugins/bearer/corewlan/corewlan.pro index 922a501..22ad550 100644 --- a/src/plugins/bearer/corewlan/corewlan.pro +++ b/src/plugins/bearer/corewlan/corewlan.pro @@ -16,9 +16,10 @@ HEADERS += qcorewlanengine.h \ ../qbearerengine_impl.h SOURCES += main.cpp \ - qcorewlanengine.mm \ ../qnetworksession_impl.cpp +OBJECTIVE_SOURCES += qcorewlanengine.mm + QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target |