diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-30 19:55:01 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-30 19:55:01 (GMT) |
| commit | 248130e6f159cf9b00cd8d4587a2f9e961eaf577 (patch) | |
| tree | a18b1f9cb98bfa634adc92f799baea0818603251 /src/plugins/bearer | |
| parent | c80df14aa4e7e31f4b9d19c23ed9e7793486d70e (diff) | |
| parent | 856711caba2736ca9330f086635b418322462c3a (diff) | |
| download | Qt-248130e6f159cf9b00cd8d4587a2f9e961eaf577.zip Qt-248130e6f159cf9b00cd8d4587a2f9e961eaf577.tar.gz Qt-248130e6f159cf9b00cd8d4587a2f9e961eaf577.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/bearer')
| -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 |