From 7e19e96ae9bff17ee9c8fc27d892775823fa7bdd Mon Sep 17 00:00:00 2001 From: apn Date: Tue, 27 Nov 2018 15:13:47 +0300 Subject: [PATCH] 0030385: Samples - Warnings during generation of projects from .pro files Define variables ARCH and VCVER in .pro files in qt samples. --- samples/qt/FuncDemo/FuncDemo.pro | 8 ++++---- samples/qt/IESample/IESample.pro | 12 ++++++------ samples/qt/Tutorial/Tutorial.pro | 12 ++++++------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/samples/qt/FuncDemo/FuncDemo.pro b/samples/qt/FuncDemo/FuncDemo.pro index d462720bd4..6e0ad68f61 100644 --- a/samples/qt/FuncDemo/FuncDemo.pro +++ b/samples/qt/FuncDemo/FuncDemo.pro @@ -44,13 +44,13 @@ unix { win32 { CONFIG(debug, debug|release) { DEFINES += _DEBUG - DESTDIR = ./win$(ARCH)/$(VCVER)/bind - OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/objd + DESTDIR = ./win$$(ARCH)/$$(VCVER)/bind + OBJECTS_DIR = ./win$$(ARCH)/$$(VCVER)/objd MOC_DIR = ./src } else { DEFINES += NDEBUG - DESTDIR = ./win$(ARCH)/$(VCVER)/bin - OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/obj + DESTDIR = ./win$$(ARCH)/$$(VCVER)/bin + OBJECTS_DIR = ./win$$(ARCH)/$$(VCVER)/obj MOC_DIR = ./src } LIBS = -L$$(QTDIR)/lib;$$(CSF_OCCTLibPath) diff --git a/samples/qt/IESample/IESample.pro b/samples/qt/IESample/IESample.pro index c59704de36..12f51c7069 100755 --- a/samples/qt/IESample/IESample.pro +++ b/samples/qt/IESample/IESample.pro @@ -58,14 +58,14 @@ unix { win32 { CONFIG(debug, debug|release) { DEFINES += _DEBUG - DESTDIR = ./win$(ARCH)/$(VCVER)/bind - OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/objd - MOC_DIR = ./win$(ARCH)/$(VCVER)/mocd + DESTDIR = ./win$$(ARCH)/$$(VCVER)/bind + OBJECTS_DIR = ./win$$(ARCH)/$$(VCVER)/objd + MOC_DIR = ./win$$(ARCH)/$$(VCVER)/mocd } else { DEFINES += NDEBUG - DESTDIR = ./win$(ARCH)/$(VCVER)/bin - OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/obj - MOC_DIR = ./win$(ARCH)/$(VCVER)/moc + DESTDIR = ./win$$(ARCH)/$$(VCVER)/bin + OBJECTS_DIR = ./win$$(ARCH)/$$(VCVER)/obj + MOC_DIR = ./win$$(ARCH)/$$(VCVER)/moc } LIBS = -L$$(QTDIR)/lib;$$(CSF_OCCTLibPath) DEFINES += NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS diff --git a/samples/qt/Tutorial/Tutorial.pro b/samples/qt/Tutorial/Tutorial.pro index 9e68fadbcc..10fc21ebf2 100755 --- a/samples/qt/Tutorial/Tutorial.pro +++ b/samples/qt/Tutorial/Tutorial.pro @@ -61,14 +61,14 @@ unix { win32 { CONFIG(debug, debug|release) { DEFINES += _DEBUG - DESTDIR = ./win$(ARCH)/$(VCVER)/bind - OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/objd - MOC_DIR = ./win$(ARCH)/$(VCVER)/mocd + DESTDIR = ./win$$(ARCH)/$$(VCVER)/bind + OBJECTS_DIR = ./win$$(ARCH)/$$(VCVER)/objd + MOC_DIR = ./win$$(ARCH)/$$(VCVER)/mocd } else { DEFINES += NDEBUG - DESTDIR = ./win$(ARCH)/$(VCVER)/bin - OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/obj - MOC_DIR = ./win$(ARCH)/$(VCVER)/moc + DESTDIR = ./win$$(ARCH)/$$(VCVER)/bin + OBJECTS_DIR = ./win$$(ARCH)/$$(VCVER)/obj + MOC_DIR = ./win$$(ARCH)/$$(VCVER)/moc } LIBS = -L$$(QTDIR)/lib;$$(CSF_OCCTLibPath) DEFINES += NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS -- 2.20.1