diff options
Diffstat (limited to 'build/qmake_extras')
-rw-r--r-- | build/qmake_extras/host/host.pro | 16 | ||||
-rw-r--r-- | build/qmake_extras/qmake_extras.pro | 6 | ||||
-rw-r--r-- | build/qmake_extras/target/target.pro | 36 |
3 files changed, 0 insertions, 58 deletions
diff --git a/build/qmake_extras/host/host.pro b/build/qmake_extras/host/host.pro deleted file mode 100644 index e99d1e7c5..000000000 --- a/build/qmake_extras/host/host.pro +++ /dev/null @@ -1,16 +0,0 @@ -# Prevent generating a makefile that attempts to create a lib -TEMPLATE = aux - -# Pick up the host toolchain -option(host_build) - -GYPI_CONTENTS = "{" \ - " 'make_global_settings': [" \ - " ['CC.host', '$$which($$QMAKE_CC)']," \ - " ['CXX.host', '$$which($$QMAKE_CXX)']," \ - " ['LD.host', '$$which($$QMAKE_LINK)']," - -GYPI_FILE = $$absolute_path('build/qmake_extras.gypi', $$QTWEBENGINE_ROOT) -!build_pass { - write_file($$GYPI_FILE, GYPI_CONTENTS) -} diff --git a/build/qmake_extras/qmake_extras.pro b/build/qmake_extras/qmake_extras.pro deleted file mode 100644 index 409993128..000000000 --- a/build/qmake_extras/qmake_extras.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = subdirs - -CONFIG += ordered - -SUBDIRS = host \ - target diff --git a/build/qmake_extras/target/target.pro b/build/qmake_extras/target/target.pro deleted file mode 100644 index 6d9f414c3..000000000 --- a/build/qmake_extras/target/target.pro +++ /dev/null @@ -1,36 +0,0 @@ -# Prevent generating a makefile that attempts to create a lib -TEMPLATE = aux - -TOOLCHAIN_INCLUDES = $${QMAKE_INCDIR_EGL} $${INCLUDEPATH} $${QMAKE_INCDIR} - -GYPI_CONTENTS += " ['CC', '$$which($$QMAKE_CC)']," \ - " ['CXX', '$$which($$QMAKE_CXX)']," \ - " ['LD', '$$which($$QMAKE_LINK)']," -GYPI_CONTENTS += " ]," \ - " 'target_defaults': {" \ - " 'target_conditions': [" \ - " ['_toolset==\"target\"', {" \ - " 'include_dirs': [" -for(includes, TOOLCHAIN_INCLUDES) { - GYPI_CONTENTS += " '$$includes'," -} -GYPI_CONTENTS += " ]," \ - " 'cflags': [" -for(cflag, QT_CFLAGS_DBUS) { - GYPI_CONTENTS += " '$$cflag'," -} -GYPI_CONTENTS += " ]," \ - " }]," \ - " ]," \ - " }," - -GYPI_CONTENTS += "}" - -GYPI_FILE = $$absolute_path('build/qmake_extras.gypi', $$QTWEBENGINE_ROOT) - -!exists($$GYPI_FILE): error("-- $$GYPI not found --") - -# Append to the file already containing the host settings. -!build_pass { - write_file($$GYPI_FILE, GYPI_CONTENTS, append) -} |