Merge branch 'master' of http://192.168.10.5:8099/sane/code_app
This commit is contained in:
commit
8428f5ca3c
|
@ -97,9 +97,12 @@ win32 {
|
|||
CONFIG(release, debug|release) {
|
||||
DESTDIR = ../../../../release/win/x86/Release/
|
||||
QMAKE_LFLAGS += /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'"
|
||||
QMAKE_CFLAGS_RELEASE += -MT
|
||||
QMAKE_CXXFLAGS_RELEASE += -MT
|
||||
}
|
||||
CONFIG(debug, debug|release) {
|
||||
|
||||
QMAKE_CFLAGS_DEBUG += -MTd
|
||||
QMAKE_CXXFLAGS_DEBUG += -MTd
|
||||
}
|
||||
}
|
||||
contains(QT_ARCH, x86_64){
|
||||
|
@ -107,9 +110,12 @@ win32 {
|
|||
CONFIG(release, debug|release) {
|
||||
DESTDIR = ../../../../release/win/x64/Release/
|
||||
QMAKE_LFLAGS += /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'"
|
||||
QMAKE_CFLAGS_RELEASE += -MT
|
||||
QMAKE_CXXFLAGS_RELEASE += -MT
|
||||
}
|
||||
CONFIG(debug, debug|release) {
|
||||
|
||||
QMAKE_CFLAGS_DEBUG += -MTd
|
||||
QMAKE_CXXFLAGS_DEBUG += -MTd
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -96,9 +96,12 @@ win32 {
|
|||
CONFIG(release, debug|release) {
|
||||
DESTDIR = ../../../../release/win/x86/Release/
|
||||
QMAKE_LFLAGS += /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'"
|
||||
QMAKE_CFLAGS_RELEASE += -MT
|
||||
QMAKE_CXXFLAGS_RELEASE += -MT
|
||||
}
|
||||
CONFIG(debug, debug|release) {
|
||||
|
||||
QMAKE_CFLAGS_DEBUG += -MTd
|
||||
QMAKE_CXXFLAGS_DEBUG += -MTd
|
||||
}
|
||||
}
|
||||
contains(QT_ARCH, x86_64){
|
||||
|
@ -106,9 +109,12 @@ win32 {
|
|||
CONFIG(release, debug|release) {
|
||||
DESTDIR = ../../../../release/win/x64/Release/
|
||||
QMAKE_LFLAGS += /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'"
|
||||
QMAKE_CFLAGS_RELEASE += -MT
|
||||
QMAKE_CXXFLAGS_RELEASE += -MT
|
||||
}
|
||||
CONFIG(debug, debug|release) {
|
||||
|
||||
QMAKE_CFLAGS_DEBUG += -MTd
|
||||
QMAKE_CXXFLAGS_DEBUG += -MTd
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -45,9 +45,12 @@ win32 {
|
|||
CONFIG(release, debug|release) {
|
||||
QMAKE_LFLAGS += /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'"
|
||||
DESTDIR = ../../../../release/win/x86/Release/
|
||||
QMAKE_CFLAGS_RELEASE += -MT
|
||||
QMAKE_CXXFLAGS_RELEASE += -MT
|
||||
}
|
||||
CONFIG(debug, debug|release) {
|
||||
|
||||
QMAKE_CFLAGS_DEBUG += -MTd
|
||||
QMAKE_CXXFLAGS_DEBUG += -MTd
|
||||
}
|
||||
}
|
||||
contains(QT_ARCH, x86_64){
|
||||
|
@ -55,9 +58,12 @@ win32 {
|
|||
CONFIG(release, debug|release) {
|
||||
QMAKE_LFLAGS += /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'"
|
||||
DESTDIR = ../../../../release/win/x64/Release/
|
||||
QMAKE_CFLAGS_RELEASE += -MT
|
||||
QMAKE_CXXFLAGS_RELEASE += -MT
|
||||
}
|
||||
CONFIG(debug, debug|release) {
|
||||
|
||||
QMAKE_CFLAGS_DEBUG += -MTd
|
||||
QMAKE_CXXFLAGS_DEBUG += -MTd
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue