]> OCCT Git - occt-copy.git/commitdiff
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 d462720bd480d3b380fe03f6e2e2f08ccd26d46b..6e0ad68f6167851df3c2942b10f1efcd19a3155e 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 c59704de36d329cba4c488404af0d24cf648c9c5..12f51c70695166b8ed16b064f2165ccdb85c9656 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 9e68fadbcc86c66aabf64e2eb4fded8860014b63..10fc21ebf2f8d8762b9175ad45473f1e1564affe 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