Last active
August 29, 2015 13:56
-
-
Save azbesthu/9110633 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/process/process.pro b/src/process/process.pro | |
index cc68e3d..50a20e2 100644 | |
--- a/src/process/process.pro | |
+++ b/src/process/process.pro | |
@@ -4,8 +4,12 @@ TEMPLATE = app | |
macx { | |
LIBPATH = $$getOutDir()/$$getConfigDir() | |
CONFIG -= app_bundle | |
-} else:LIBPATH = $$getOutDir()/$$getConfigDir()/lib | |
-LIBS_PRIVATE += -L$$LIBPATH -lQt5WebEngineCore | |
+} else:win32:LIBPATH = $$getOutDir()/$$getConfigDir() | |
+else:LIBPATH = $$getOutDir()/$$getConfigDir()/lib | |
+win32 { | |
+# Link against Qt5WebEngineCore.dll.lib | |
+LIBS_PRIVATE += -L$$LIBPATH -lQt5WebEngineCore.dll | |
+} else:LIBS_PRIVATE += -L$$LIBPATH -lQt5WebEngineCore | |
QMAKE_RPATHDIR += $$LIBPATH | |
qnx: QMAKE_RPATHLINKDIR += $${QNX_DIR}/$${QNX_CPUDIR}/usr/lib/qt5/lib | |
diff --git a/src/webengine/webengine.pro b/src/webengine/webengine.pro | |
index 0627804..1ef473d 100644 | |
--- a/src/webengine/webengine.pro | |
+++ b/src/webengine/webengine.pro | |
@@ -9,9 +9,12 @@ QT_PRIVATE += qml-private quick-private gui-private core-private | |
INCLUDEPATH += $$PWD api ../core | |
# FIXME: all this should eventually be turned into QT += webenginecore | |
-macx:LIBPATH = $$getOutDir()/$$getConfigDir() | |
+macx|win32:LIBPATH = $$getOutDir()/$$getConfigDir() | |
else:LIBPATH = $$getOutDir()/$$getConfigDir()/lib | |
-LIBS_PRIVATE += -lQt5WebEngineCore -L$$LIBPATH | |
+win32 { | |
+# Link against Qt5WebEngineCore.dll.lib | |
+LIBS_PRIVATE += -L$$LIBPATH -lQt5WebEngineCore.dll | |
+} else:LIBS_PRIVATE += -L$$LIBPATH -lQt5WebEngineCore | |
QMAKE_RPATHDIR += $$LIBPATH | |
#DESTDIR = $$LIBPATH | |
diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro | |
index 86367d7..c1d4381 100644 | |
--- a/src/webenginewidgets/webenginewidgets.pro | |
+++ b/src/webenginewidgets/webenginewidgets.pro | |
@@ -7,8 +7,12 @@ QT += widgets | |
QT_PRIVATE += widgets-private gui-private core-private | |
# FIXME: all this should eventually be turned into QT += webenginecore | |
-macx:LIBPATH = $$getOutDir()/$$getConfigDir() | |
+macx|win32:LIBPATH = $$getOutDir()/$$getConfigDir() | |
else:LIBPATH = $$getOutDir()/$$getConfigDir()/lib | |
+win32 { | |
+# Link against Qt5WebEngineCore.dll.lib | |
+LIBS_PRIVATE += -L$$LIBPATH -lQt5WebEngineCore.dll | |
+} else:LIBS_PRIVATE += -L$$LIBPATH -lQt5WebEngineCore | |
LIBS_PRIVATE += -L$$LIBPATH -lQt5WebEngineCore | |
QMAKE_RPATHDIR += $$LIBPATH | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment