summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/android-g++/qmake.conf24
-rw-r--r--mkspecs/common/linux.conf2
-rw-r--r--mkspecs/common/shell-unix.conf15
-rw-r--r--mkspecs/common/shell-win32.conf18
-rw-r--r--mkspecs/common/unix.conf2
-rw-r--r--mkspecs/common/wince/qmake.conf2
-rw-r--r--mkspecs/common/winrt_winphone/qmake.conf2
-rw-r--r--mkspecs/cygwin-g++/qmake.conf1
-rw-r--r--mkspecs/features/spec_post.prf62
-rw-r--r--mkspecs/hurd-g++/qmake.conf2
-rw-r--r--mkspecs/unsupported/linux-host-g++/qmake.conf2
-rw-r--r--mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf2
-rw-r--r--mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf2
-rw-r--r--mkspecs/win32-g++/qmake.conf13
-rw-r--r--mkspecs/win32-icc/qmake.conf2
-rw-r--r--mkspecs/win32-msvc2005/qmake.conf1
-rw-r--r--mkspecs/win32-msvc2008/qmake.conf1
-rw-r--r--mkspecs/win32-msvc2010/qmake.conf1
-rw-r--r--mkspecs/win32-msvc2012/qmake.conf1
-rw-r--r--mkspecs/win32-msvc2013/qmake.conf1
-rw-r--r--mkspecs/win32-msvc2015/qmake.conf1
21 files changed, 64 insertions, 93 deletions
diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf
index e334686b49..2fb2f4cc20 100644
--- a/mkspecs/android-g++/qmake.conf
+++ b/mkspecs/android-g++/qmake.conf
@@ -10,30 +10,6 @@ include(../common/gcc-base-unix.conf)
load(device_config)
-# Passing in -win32 to qmake (from NQTC) causes this condition to pass, however
-# qmake complains that -win32 is deprecated; should find another way, Q_OS_WIN
-# should really be all QMAKE_HOST.os needs to depend on?
-contains(QMAKE_HOST.os,Windows) {
- # Not having sh.exe in your path causes this condition to pass
- # To build Android Qt on Windows, this block must not be evaluated.
- isEmpty(QMAKE_SH) {
- # Override values from previously loaded shell-unix.conf
- # (via unix.conf, via linux.conf).
- include(../common/shell-win32.conf)
- QMAKE_DEL_TREE = rmdir /s /q
- QMAKE_INSTALL_FILE = copy /y
- QMAKE_INSTALL_PROGRAM = copy /y
- } else {
- MINGW_IN_SHELL = 1
- QMAKE_DIR_SEP = /
- QMAKE_DIRLIST_SEP = :
- # Because install's ability to set permissions is not relevant on Windows,
- # and git's msys does not provide it to start with.
- QMAKE_INSTALL_FILE = cp -f
- QMAKE_INSTALL_PROGRAM = cp -f
- }
-}
-
NDK_ROOT = $$(ANDROID_NDK_ROOT)
!exists($$NDK_ROOT) {
NDK_ROOT = $$DEFAULT_ANDROID_NDK_ROOT
diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
index e10ab71cd6..8d6fb6fe17 100644
--- a/mkspecs/common/linux.conf
+++ b/mkspecs/common/linux.conf
@@ -51,7 +51,5 @@ QMAKE_RANLIB =
QMAKE_STRIP = strip
QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-QMAKE_INSTALL_FILE = install -m 644 -p
-QMAKE_INSTALL_PROGRAM = install -m 755 -p
include(unix.conf)
diff --git a/mkspecs/common/shell-unix.conf b/mkspecs/common/shell-unix.conf
index a533e77cb5..2ab932f7b8 100644
--- a/mkspecs/common/shell-unix.conf
+++ b/mkspecs/common/shell-unix.conf
@@ -1,14 +1 @@
-QMAKE_TAR = tar -cf
-QMAKE_GZIP = gzip -9f
-
-QMAKE_COPY = cp -f
-QMAKE_COPY_FILE = $$QMAKE_COPY
-QMAKE_COPY_DIR = $$QMAKE_COPY -R
-QMAKE_MOVE = mv -f
-QMAKE_DEL_FILE = rm -f
-QMAKE_DEL_DIR = rmdir
-QMAKE_CHK_EXISTS = test -e %1 ||
-QMAKE_CHK_DIR_EXISTS = test -d # legacy
-QMAKE_MKDIR = mkdir -p # legacy
-QMAKE_MKDIR_CMD = test -d %1 || mkdir -p %1
-QMAKE_STREAM_EDITOR = sed
+warning("shell-unix.conf is deprecated and has no effect.")
diff --git a/mkspecs/common/shell-win32.conf b/mkspecs/common/shell-win32.conf
index 1da8057c43..c6f3514697 100644
--- a/mkspecs/common/shell-win32.conf
+++ b/mkspecs/common/shell-win32.conf
@@ -1,17 +1 @@
-QMAKE_ZIP = zip -r -9
-
-QMAKE_COPY = copy /y
-QMAKE_COPY_DIR = xcopy /s /q /y /i
-QMAKE_MOVE = move
-QMAKE_DEL_FILE = del
-QMAKE_DEL_DIR = rmdir
-QMAKE_CHK_EXISTS = if not exist %1
-QMAKE_CHK_DIR_EXISTS = if not exist # legacy
-QMAKE_MKDIR = mkdir # legacy
-QMAKE_MKDIR_CMD = if not exist %1 mkdir %1 & if not exist %1 exit 1
-# Ugly hack to support cross-building for unix (android).
-QMAKE_SYMBOLIC_LINK = $$QMAKE_COPY
-QMAKE_LN_SHLIB = $$QMAKE_SYMBOLIC_LINK
-# xcopy copies the contained files if source is a directory. Deal with it.
-CONFIG += copy_dir_files
-QMAKE_STREAM_EDITOR = $(QMAKE) -install sed
+warning("shell-win32.conf is deprecated and has no effect.")
diff --git a/mkspecs/common/unix.conf b/mkspecs/common/unix.conf
index c0deafd141..2146b62f17 100644
--- a/mkspecs/common/unix.conf
+++ b/mkspecs/common/unix.conf
@@ -14,5 +14,3 @@ QMAKE_YACC_SOURCE = $base.tab.c
QMAKE_PREFIX_SHLIB = lib
QMAKE_PREFIX_STATICLIB = lib
QMAKE_EXTENSION_STATICLIB = a
-
-include(shell-unix.conf)
diff --git a/mkspecs/common/wince/qmake.conf b/mkspecs/common/wince/qmake.conf
index 6e2e24dbd0..434e063de8 100644
--- a/mkspecs/common/wince/qmake.conf
+++ b/mkspecs/common/wince/qmake.conf
@@ -73,8 +73,6 @@ QMAKE_IDL = midl
QMAKE_LIB = lib
QMAKE_RC = rc
-include(../shell-win32.conf)
-
VCPROJ_EXTENSION = .vcproj
VCSOLUTION_EXTENSION = .sln
VCPROJ_KEYWORD = Qt4VSv1.0
diff --git a/mkspecs/common/winrt_winphone/qmake.conf b/mkspecs/common/winrt_winphone/qmake.conf
index 70bd0a3945..d71915408d 100644
--- a/mkspecs/common/winrt_winphone/qmake.conf
+++ b/mkspecs/common/winrt_winphone/qmake.conf
@@ -85,8 +85,6 @@ QMAKE_IDL = midl
QMAKE_LIB = lib /NOLOGO
QMAKE_RC = rc
-include(../shell-win32.conf)
-
VCPROJ_EXTENSION = .vcxproj
VCSOLUTION_EXTENSION = .sln
VCPROJ_KEYWORD = Qt4VSv1.0
diff --git a/mkspecs/cygwin-g++/qmake.conf b/mkspecs/cygwin-g++/qmake.conf
index 06135beb30..caed4133b1 100644
--- a/mkspecs/cygwin-g++/qmake.conf
+++ b/mkspecs/cygwin-g++/qmake.conf
@@ -73,5 +73,4 @@ QMAKE_OBJCOPY = objcopy
QMAKE_NM = nm -P
QMAKE_RANLIB =
-include(../common/shell-unix.conf)
load(qt_config)
diff --git a/mkspecs/features/spec_post.prf b/mkspecs/features/spec_post.prf
index b4f9ca47ae..c9578773fe 100644
--- a/mkspecs/features/spec_post.prf
+++ b/mkspecs/features/spec_post.prf
@@ -54,3 +54,65 @@ isEmpty(QMAKE_COMPILER) {
warning("qmake spec does not announce the compiler family. Guessed $${QMAKE_COMPILER}.")
}
CONFIG += $$QMAKE_COMPILER
+
+equals(MAKEFILE_GENERATOR, MSBUILD) \
+|equals(MAKEFILE_GENERATOR, MSVC.NET) \
+|isEmpty(QMAKE_SH) {
+ QMAKE_ZIP = zip -r -9
+
+ QMAKE_COPY = copy /y
+ QMAKE_COPY_FILE = $$QMAKE_COPY
+ QMAKE_COPY_DIR = xcopy /s /q /y /i
+ # xcopy copies the contained files if source is a directory. Deal with it.
+ CONFIG += copy_dir_files
+ QMAKE_MOVE = move
+ QMAKE_DEL_FILE = del
+ QMAKE_DEL_DIR = rmdir
+ QMAKE_DEL_TREE = rmdir /s /q
+ QMAKE_CHK_EXISTS = if not exist %1
+ QMAKE_CHK_DIR_EXISTS = if not exist # legacy
+ QMAKE_MKDIR = mkdir # legacy
+ QMAKE_MKDIR_CMD = if not exist %1 mkdir %1 & if not exist %1 exit 1
+ QMAKE_STREAM_EDITOR = $(QMAKE) -install sed
+ QMAKE_INSTALL_FILE = copy /y
+ QMAKE_INSTALL_PROGRAM = copy /y
+} else {
+ QMAKE_TAR = tar -cf
+ QMAKE_GZIP = gzip -9f
+
+ QMAKE_COPY = cp -f
+ QMAKE_COPY_FILE = $$QMAKE_COPY
+ QMAKE_COPY_DIR = $$QMAKE_COPY -R
+ QMAKE_MOVE = mv -f
+ QMAKE_DEL_FILE = rm -f
+ QMAKE_DEL_DIR = rmdir
+ QMAKE_DEL_TREE = rm -rf
+ QMAKE_CHK_EXISTS = test -e %1 ||
+ QMAKE_CHK_DIR_EXISTS = test -d # legacy
+ QMAKE_MKDIR = mkdir -p # legacy
+ QMAKE_MKDIR_CMD = test -d %1 || mkdir -p %1
+ QMAKE_STREAM_EDITOR = sed
+
+ equals(QMAKE_HOST.os, Windows) {
+ MINGW_IN_SHELL = 1 # legacy
+ # Override built-ins.
+ QMAKE_DIR_SEP = /
+ QMAKE_DIRLIST_SEP = :
+ # Because install's ability to set permissions is not relevant on Windows,
+ # and git's msys does not provide it to start with.
+ QMAKE_INSTALL_FILE = cp -f
+ QMAKE_INSTALL_PROGRAM = cp -f
+ } else {
+ QMAKE_INSTALL_FILE = install -m 644 -p
+ QMAKE_INSTALL_PROGRAM = install -m 755 -p
+ }
+}
+QMAKE_INSTALL_DIR = $$QMAKE_COPY_DIR
+equals(QMAKE_HOST.os, Windows) {
+ # Ugly (and broken for relative paths) hack to support cross-building for Unix.
+ QMAKE_SYMBOLIC_LINK = $$QMAKE_COPY
+ QMAKE_LN_SHLIB = $$QMAKE_SYMBOLIC_LINK
+} else {
+ QMAKE_SYMBOLIC_LINK = ln -f -s
+ QMAKE_LN_SHLIB = ln -s
+}
diff --git a/mkspecs/hurd-g++/qmake.conf b/mkspecs/hurd-g++/qmake.conf
index d53b49ced2..e7e4e3a82d 100644
--- a/mkspecs/hurd-g++/qmake.conf
+++ b/mkspecs/hurd-g++/qmake.conf
@@ -45,8 +45,6 @@ QMAKE_RANLIB =
QMAKE_STRIP = strip
QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-QMAKE_INSTALL_FILE = install -m 644 -p
-QMAKE_INSTALL_PROGRAM = install -m 755 -p
include(../common/unix.conf)
include(../common/gcc-base-unix.conf)
diff --git a/mkspecs/unsupported/linux-host-g++/qmake.conf b/mkspecs/unsupported/linux-host-g++/qmake.conf
index 3dc490d6dd..1523126eaa 100644
--- a/mkspecs/unsupported/linux-host-g++/qmake.conf
+++ b/mkspecs/unsupported/linux-host-g++/qmake.conf
@@ -109,8 +109,6 @@ QMAKE_RANLIB =
QMAKE_STRIP = host-strip
QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-QMAKE_INSTALL_FILE = install -m 644 -p
-QMAKE_INSTALL_PROGRAM = install -m 755 -p
include(../../common/unix.conf)
load(qt_config)
diff --git a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
index 814b844131..a4cf23df9c 100644
--- a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
+++ b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
@@ -87,8 +87,6 @@ QMAKE_RANLIB =
QMAKE_STRIP = strip
QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-QMAKE_INSTALL_FILE = install -m 644 -p
-QMAKE_INSTALL_PROGRAM = install -m 755 -p
include(../../common/unix.conf)
load(qt_config)
diff --git a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
index c362d098db..49f0c21d4a 100644
--- a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
+++ b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
@@ -86,8 +86,6 @@ QMAKE_RANLIB =
QMAKE_STRIP = strip
QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-QMAKE_INSTALL_FILE = install -m 644 -p
-QMAKE_INSTALL_PROGRAM = install -m 755 -p
include(../../common/unix.conf)
load(qt_config)
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index 9f0188be80..c6ff808a99 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -93,19 +93,6 @@ QMAKE_LIBS_OPENGL_ES2_DEBUG = -llibEGLd -llibGLESv2d -lgdi32 -luser32
QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
-!isEmpty(QMAKE_SH) {
- MINGW_IN_SHELL = 1
- QMAKE_DIR_SEP = /
- QMAKE_DIRLIST_SEP = :
- include(../common/shell-unix.conf)
- # Because install's ability to set permissions is not relevant on Windows,
- # and git's msys does not provide it to start with.
- QMAKE_INSTALL_FILE = cp -f
- QMAKE_INSTALL_PROGRAM = cp -f
-} else {
- include(../common/shell-win32.conf)
-}
-
QMAKE_IDL = midl
QMAKE_LIB = $${CROSS_COMPILE}ar -ru
QMAKE_RC = $${CROSS_COMPILE}windres
diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf
index d326cdeee3..2ec0d84918 100644
--- a/mkspecs/win32-icc/qmake.conf
+++ b/mkspecs/win32-icc/qmake.conf
@@ -79,7 +79,5 @@ QMAKE_IDL = midl
QMAKE_LIB = xilib /NOLOGO
QMAKE_RC = rc
-include(../common/shell-win32.conf)
-
DSP_EXTENSION = .dsp
load(qt_config)
diff --git a/mkspecs/win32-msvc2005/qmake.conf b/mkspecs/win32-msvc2005/qmake.conf
index ca901effd3..458f37cc04 100644
--- a/mkspecs/win32-msvc2005/qmake.conf
+++ b/mkspecs/win32-msvc2005/qmake.conf
@@ -7,5 +7,4 @@
MSC_VER = 1400
MSVC_VER = 8.0
include(../common/msvc-desktop.conf)
-include(../common/shell-win32.conf)
load(qt_config)
diff --git a/mkspecs/win32-msvc2008/qmake.conf b/mkspecs/win32-msvc2008/qmake.conf
index 1a04c9952b..d1382ff2d4 100644
--- a/mkspecs/win32-msvc2008/qmake.conf
+++ b/mkspecs/win32-msvc2008/qmake.conf
@@ -7,5 +7,4 @@
MSC_VER = 1500
MSVC_VER = 9.0
include(../common/msvc-desktop.conf)
-include(../common/shell-win32.conf)
load(qt_config)
diff --git a/mkspecs/win32-msvc2010/qmake.conf b/mkspecs/win32-msvc2010/qmake.conf
index 8160001a4b..3ad9d478ee 100644
--- a/mkspecs/win32-msvc2010/qmake.conf
+++ b/mkspecs/win32-msvc2010/qmake.conf
@@ -7,5 +7,4 @@
MSC_VER = 1600
MSVC_VER = 10.0
include(../common/msvc-desktop.conf)
-include(../common/shell-win32.conf)
load(qt_config)
diff --git a/mkspecs/win32-msvc2012/qmake.conf b/mkspecs/win32-msvc2012/qmake.conf
index 57161071c8..3d9c5864af 100644
--- a/mkspecs/win32-msvc2012/qmake.conf
+++ b/mkspecs/win32-msvc2012/qmake.conf
@@ -7,5 +7,4 @@
MSC_VER = 1700
MSVC_VER = 11.0
include(../common/msvc-desktop.conf)
-include(../common/shell-win32.conf)
load(qt_config)
diff --git a/mkspecs/win32-msvc2013/qmake.conf b/mkspecs/win32-msvc2013/qmake.conf
index ece04203ea..34108b2c32 100644
--- a/mkspecs/win32-msvc2013/qmake.conf
+++ b/mkspecs/win32-msvc2013/qmake.conf
@@ -7,5 +7,4 @@
MSC_VER = 1800
MSVC_VER = 12.0
include(../common/msvc-desktop.conf)
-include(../common/shell-win32.conf)
load(qt_config)
diff --git a/mkspecs/win32-msvc2015/qmake.conf b/mkspecs/win32-msvc2015/qmake.conf
index 617adb681c..ea654d4296 100644
--- a/mkspecs/win32-msvc2015/qmake.conf
+++ b/mkspecs/win32-msvc2015/qmake.conf
@@ -7,5 +7,4 @@
MSC_VER = 1900
MSVC_VER = 14.0
include(../common/msvc-desktop.conf)
-include(../common/shell-win32.conf)
load(qt_config)
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 06:15:17 +0000