0030385: Samples - Warnings during generation of projects from .pro files
authorapn <apn@opencascade.com>
Tue, 27 Nov 2018 12:13:47 +0000 (15:13 +0300)
committerapn <apn@opencascade.com>
Tue, 27 Nov 2018 12:13:47 +0000 (15:13 +0300)
Define variables ARCH and VCVER in .pro files in qt samples.

samples/qt/FuncDemo/FuncDemo.pro
samples/qt/IESample/IESample.pro
samples/qt/Tutorial/Tutorial.pro

index d462720..6e0ad68 100644 (file)
@@ -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)
index c59704d..12f51c7 100755 (executable)
@@ -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
index 9e68fad..10fc21e 100755 (executable)
@@ -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