Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts: src/gsttools/qgstreamervideoinputdevicecontrol.cpp src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp Change-Id: Ic854589562d2deeaa0ebf75840cb8a2ee32e99de
This commit is contained in:
@@ -30,8 +30,11 @@
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef _WIN32_WCE
|
||||
#include <wmp.h>
|
||||
#else
|
||||
#include <wmpcore.h>
|
||||
#endif
|
||||
|
||||
int main(int, char**)
|
||||
{
|
||||
|
||||
@@ -3,4 +3,5 @@ CONFIG += console
|
||||
|
||||
SOURCES += main.cpp
|
||||
|
||||
LIBS += -lstrmiids -lole32 -lOleaut32 -luser32 -lgdi32
|
||||
LIBS += -lstrmiids -lole32 -lOleaut32
|
||||
!wince*:LIBS += -luser32 -lgdi32
|
||||
|
||||
Reference in New Issue
Block a user