Review Request 115343: Fix msvc build of solid
Alexander Richardson
arichardson.kde at googlemail.com
Tue Feb 4 15:43:02 UTC 2014
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/115343/
-----------------------------------------------------------
(Updated Feb. 4, 2014, 3:43 p.m.)
Status
------
This change has been marked as submitted.
Review request for KDE Frameworks.
Repository: solid
Description
-------
1) Fix linking on windows
Automoc only looks at <basename>.h and <basename>_p.h, since this does not
match we have to explicitly include moc_networking(_p).cpp
-------------------------------------------------------------------------------
2) Fix compilation on windows by including qt_windows.h
This file makes sure that NOMINMAX is defined so the build can succeed
Diffs
-----
src/solid/networking_win.cpp 62ebacbe8b3ee421bf8e404d72dba4619c2a7e73
autotests/solidhwtest.cpp 0e3fa05351f27165eb443e90324abacf911a8b0d
src/solid/backends/win/windevicemanager.h b73ccfcd0588fe39e2a32cde501119ca3877f552
src/solid/backends/win/winstoragedrive.cpp 357699fc1d0f7cca1d7e68e0a2a9f875288e5453
src/solid/backends/win/winstoragevolume.cpp eae68af57dca253d962d9802d6a9a876cb563b72
src/solid/backends/wmi/wmiquery.h 8f3f0a458ad517153a0a76a812175346e84452fa
Diff: https://git.reviewboard.kde.org/r/115343/diff/
Testing
-------
compiles now, didn't before
Thanks,
Alexander Richardson
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20140204/f1008946/attachment-0001.html>
More information about the Kde-frameworks-devel
mailing list