diff options
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/angle.conf | 13 | ||||
| -rw-r--r-- | mkspecs/common/g++-win32.conf | 1 | ||||
| -rw-r--r-- | mkspecs/common/msvc-desktop.conf | 1 | ||||
| -rw-r--r-- | mkspecs/common/winrt_winphone/qmake.conf | 2 |
4 files changed, 0 insertions, 17 deletions
diff --git a/mkspecs/common/angle.conf b/mkspecs/common/angle.conf deleted file mode 100644 index fad0e719d2..0000000000 --- a/mkspecs/common/angle.conf +++ /dev/null @@ -1,13 +0,0 @@ -# Renaming these files requires that the LIBRARY entry of their corresponding -# def files are also updated to reflect the name. -# The .def files are found in the angle directories: -# -# qtbase\src\3rdparty\angle\src\libEGL\libEGL[d?].def -# qtbase\src\3rdparty\angle\src\libEGL\libGLESv2[d?].def -# -# If a combined ANGLE library is used, the def files will automatically be -# combined into QtANGLE[d?].def by QtAngle.pro. - -LIBEGL_NAME = libEGL -LIBGLESV2_NAME = libGLESv2 -LIBQTANGLE_NAME = QtANGLE diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf index c3a1f3a373..b198d69fd6 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf @@ -76,5 +76,4 @@ QMAKE_STRIPFLAGS_LIB += --strip-unneeded QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy QMAKE_NM = $${CROSS_COMPILE}nm -P -include(angle.conf) include(windows-vulkan.conf) diff --git a/mkspecs/common/msvc-desktop.conf b/mkspecs/common/msvc-desktop.conf index f5d12f445b..a5993287ed 100644 --- a/mkspecs/common/msvc-desktop.conf +++ b/mkspecs/common/msvc-desktop.conf @@ -115,6 +115,5 @@ VCPROJ_EXTENSION = .vcproj VCSOLUTION_EXTENSION = .sln VCPROJ_KEYWORD = Qt4VSv1.0 -include(angle.conf) include(windows-desktop.conf) include(windows-vulkan.conf) diff --git a/mkspecs/common/winrt_winphone/qmake.conf b/mkspecs/common/winrt_winphone/qmake.conf index e683018a81..55fcbe5ab3 100644 --- a/mkspecs/common/winrt_winphone/qmake.conf +++ b/mkspecs/common/winrt_winphone/qmake.conf @@ -100,6 +100,4 @@ WINRT_MANIFEST.capabilities_device = defaults WINDOWS_TARGET_PLATFORM_VERSION = $$(UCRTVERSION) -include(../angle.conf) - load(qt_config) |