diff options
| author | Lorn Potter <lorn.potter@gmail.com> | 2018-06-04 18:52:57 +1000 |
|---|---|---|
| committer | Lorn Potter <lorn.potter@gmail.com> | 2018-06-05 04:25:23 +0000 |
| commit | 313dba2d81735313b4d245ed4d463bb1ce6619de (patch) | |
| tree | 27b954312b748dbffbf6256913c842e9e8311223 | |
| parent | b2443982525c36c8557acf28feed3fa34518d034 (diff) | |
wasm: cleanup pro and friends files
Change-Id: I18630bf58c761162a5196c4c81da6c4208260fc2
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
| -rw-r--r-- | examples/corelib/corelib.pro | 2 | ||||
| -rw-r--r-- | examples/opengl/opengl.pro | 5 | ||||
| -rw-r--r-- | examples/widgets/statemachine/statemachine.pro | 6 | ||||
| -rw-r--r-- | src/network/access/access.pri | 3 | ||||
| -rw-r--r-- | src/plugins/platforms/html5/html5.pro | 2 | ||||
| -rw-r--r-- | src/src.pro | 5 |
6 files changed, 5 insertions, 18 deletions
diff --git a/examples/corelib/corelib.pro b/examples/corelib/corelib.pro index db15633f56..31c3a2b164 100644 --- a/examples/corelib/corelib.pro +++ b/examples/corelib/corelib.pro @@ -8,5 +8,5 @@ SUBDIRS = \ tools !emscripten: SUBDIRS += \ - threads \ + threads diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro index 5a1765ac99..6b92e404b9 100644 --- a/examples/opengl/opengl.pro +++ b/examples/opengl/opengl.pro @@ -1,9 +1,8 @@ TEMPLATE = subdirs -SUBDIRS = paintedwindow \ +SUBDIRS = hellowindow \ + paintedwindow \ qopenglwindow -!emscripten: SUBDIRS += \ - hellowindow qtHaveModule(widgets) { SUBDIRS += contextinfo \ diff --git a/examples/widgets/statemachine/statemachine.pro b/examples/widgets/statemachine/statemachine.pro index 8b137b318a..cd9204683f 100644 --- a/examples/widgets/statemachine/statemachine.pro +++ b/examples/widgets/statemachine/statemachine.pro @@ -1,9 +1,7 @@ TEMPLATE = subdirs -SUBDIRS = \ -!emscripten: SUBDIRS += \ - factorial \ - pingpong +SUBDIRS += factorial \ + pingpong qtHaveModule(widgets) { SUBDIRS += \ diff --git a/src/network/access/access.pri b/src/network/access/access.pri index d5cec4dbb9..caa81b9497 100644 --- a/src/network/access/access.pri +++ b/src/network/access/access.pri @@ -69,13 +69,10 @@ qtConfig(networkdiskcache) { mac: LIBS_PRIVATE += -framework Security emscripten: { -message("EMSCRIPTEN") - SOURCES += \ access/qnetworkreplyemscriptenimpl.cpp HEADERS += \ access/qnetworkreplyemscriptenimpl_p.h - } include($$PWD/../../3rdparty/zlib_dependency.pri) diff --git a/src/plugins/platforms/html5/html5.pro b/src/plugins/platforms/html5/html5.pro index 663261866a..47b38bfbd8 100644 --- a/src/plugins/platforms/html5/html5.pro +++ b/src/plugins/platforms/html5/html5.pro @@ -6,8 +6,6 @@ QT += \ #DEFINES += QEGL_EXTRA_DEBUG -#DEFINES += Q_OPENKODE - # Avoid X11 header collision, use generic EGL native types DEFINES += QT_EGL_NO_X11 diff --git a/src/src.pro b/src/src.pro index eb8824ec3f..3390471a32 100644 --- a/src/src.pro +++ b/src/src.pro @@ -230,11 +230,6 @@ nacl: SUBDIRS -= src_network src_testlib android:!android-embedded: SUBDIRS += src_android src_3rdparty_gradle -#emscripten { -# SUBDIRS -= src_network src_concurrent -# src_plugins.depends -= src_network -#} - TR_EXCLUDE = \ src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic src_tools_qlalr \ src_tools_bootstrap_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml \ |