Changeset 861

Timestamp:

May 14, 2011, 10:36:54 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Replace all single back slashes used as path separators qmake files with double back slashes as they are now deprecated by qmake.

Location:

trunk

Files:

• configure.cmd (modified) (6 diffs)
• mkspecs/os2-g++/qmake.conf (modified) (3 diffs)

trunk/configure.cmd

@@ -910 +910 @@
      * used by qmake/project.cpp to determine the original QMAKESPEC */
     call charout G.RelPath"\mkspecs\default\qmake.conf",,
-        G.EOL"QMAKESPEC_ORIGINAL="G.RelPath"\mkspecs\"G.PLATFORM||G.EOL
+        G.EOL"QMAKESPEC_ORIGINAL="||CPPPath(G.RelPath"\mkspecs\")||G.PLATFORM||G.EOL
     call charout G.RelPath"\mkspecs\default\qmake.conf"
 
@@ -1144 +1144 @@
     end
 
-    call QMakeVar "set", "PRECOMPILED_DIR", "tmp\pch\"G.QMAKE_OUTDIR
-    call QMakeVar "set", "OBJECTS_DIR", "tmp\obj\"G.QMAKE_OUTDIR
-    call QMakeVar "set", "MOC_DIR", "tmp\moc\"G.QMAKE_OUTDIR
-    call QMakeVar "set", "RCC_DIR", "tmp\rcc\"G.QMAKE_OUTDIR
-    call QMakeVar "set", "UI_DIR", "tmp\uic\"G.QMAKE_OUTDIR
+    call QMakeVar "set", "PRECOMPILED_DIR", CPPPath("tmp\pch\"G.QMAKE_OUTDIR)
+    call QMakeVar "set", "OBJECTS_DIR", CPPPath("tmp\obj\"G.QMAKE_OUTDIR)
+    call QMakeVar "set", "MOC_DIR", CPPPath("tmp\moc\"G.QMAKE_OUTDIR)
+    call QMakeVar "set", "RCC_DIR", CPPPath("tmp\rcc\"G.QMAKE_OUTDIR)
+    call QMakeVar "set", "UI_DIR", CPPPath("tmp\uic\"G.QMAKE_OUTDIR)
 
     if (G.CFG_LARGEFILE == "yes") then
@@ -1805 +1805 @@
     call charout qmake_cache_new,,
 'CONFIG         += 'G.QMAKE_CONFIG' create_prl link_prl depend_includepath fix_output_dirs QTDIR_build'G.EOL||,
-'QT_SOURCE_TREE  = 'QuotePath(G.RelPath)||G.EOL||,
-'QT_BUILD_TREE   = 'QuotePath(G.OutPath)||G.EOL||,
+'QT_SOURCE_TREE  = 'QuotePath(CPPPath(G.RelPath))||G.EOL||,
+'QT_BUILD_TREE   = 'QuotePath(CPPPath(G.OutPath))||G.EOL||,
 'QT_BUILD_PARTS  = 'G.CFG_BUILD_PARTS||G.EOL||,
-'QMAKE_MOC_SRC   = $$QT_BUILD_TREE\src\moc'G.EOL||,
+'QMAKE_MOC_SRC   = $$QT_BUILD_TREE\\src\\moc'G.EOL||,
 ''G.EOL||,
 '#local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR'G.EOL||,
-'QMAKE_MOC       = $$QT_BUILD_TREE\bin\moc.exe'G.EOL||,
-'QMAKE_UIC       = $$QT_BUILD_TREE\bin\uic.exe'G.EOL||,
-'QMAKE_UIC3      = $$QT_BUILD_TREE\bin\uic3.exe'G.EOL||,
-'QMAKE_RCC       = $$QT_BUILD_TREE\bin\rcc.exe'G.EOL||,
-'QMAKE_INCDIR_QT = $$QT_BUILD_TREE\include'G.EOL||,
-'QMAKE_LIBDIR_QT = $$QT_BUILD_TREE\lib'G.EOL||G.EOL
+'QMAKE_MOC       = $$QT_BUILD_TREE\\bin\\moc.exe'G.EOL||,
+'QMAKE_UIC       = $$QT_BUILD_TREE\\bin\\uic.exe'G.EOL||,
+'QMAKE_UIC3      = $$QT_BUILD_TREE\\bin\\uic3.exe'G.EOL||,
+'QMAKE_RCC       = $$QT_BUILD_TREE\\bin\\rcc.exe'G.EOL||,
+'QMAKE_INCDIR_QT = $$QT_BUILD_TREE\\include'G.EOL||,
+'QMAKE_LIBDIR_QT = $$QT_BUILD_TREE\\lib'G.EOL||G.EOL
 
     if (G.MYSQL_INCLUDEPATH \== "") then
-        call lineout qmake_cache_new, 'MYSQL_INCLUDEPATH = 'G.MYSQL_INCLUDEPATH
+        call lineout qmake_cache_new, 'MYSQL_INCLUDEPATH = 'CPPPath(G.MYSQL_INCLUDEPATH)
     if (G.MYSQL_LIBS \== "") then
-        call lineout qmake_cache_new, 'MYSQL_LIBS = 'G.MYSQL_LIBS
+        call lineout qmake_cache_new, 'MYSQL_LIBS = 'CPPPath(G.MYSQL_LIBS)
 
     if (G.PSQL_INCLUDEPATH \== "") then
-        call lineout qmake_cache_new, 'PSQL_INCLUDEPATH = 'G.PSQL_INCLUDEPATH
+        call lineout qmake_cache_new, 'PSQL_INCLUDEPATH = 'CPPPath(G.PSQL_INCLUDEPATH)
     if (G.PSQL_LIBS \== "") then
-        call lineout qmake_cache_new, 'PSQL_LIBS = 'G.PSQL_LIBS
+        call lineout qmake_cache_new, 'PSQL_LIBS = 'CPPPath(G.PSQL_LIBS)
 
     if (G.QT_EDITION \== "QT_EDITION_OPENSOURCE") then
@@ -1834 +1834 @@
     if (G.CFG_CUPS == "yes") then do
         if (G.CUPS_INCLUDEPATH \== "") then
-            call lineout qmake_cache_new, 'CUPS_INCLUDEPATH = 'G.CUPS_INCLUDEPATH
+            call lineout qmake_cache_new, 'CUPS_INCLUDEPATH = 'CPPPath(G.CUPS_INCLUDEPATH)
         if (G.CUPS_LIBS \== "") then
-            call lineout qmake_cache_new, 'CUPS_LIBS = 'G.CUPS_LIBS
+            call lineout qmake_cache_new, 'CUPS_LIBS = 'CPPPath(G.CUPS_LIBS)
     end
 
@@ -1842 +1842 @@
     if (G.CFG_OPENSSL == "yes") then do
         if (G.OPENSSL_INCLUDEPATH \== "") then
-            call lineout qmake_cache_new, 'OPENSSL_INCLUDEPATH = 'G.OPENSSL_INCLUDEPATH
+            call lineout qmake_cache_new, 'OPENSSL_INCLUDEPATH = 'CPPPath(G.OPENSSL_INCLUDEPATH)
         if (G.OPENSSL_LIBS \== "") then
-            call lineout qmake_cache_new, 'OPENSSL_LIBS = 'G.OPENSSL_LIBS
+            call lineout qmake_cache_new, 'OPENSSL_LIBS = 'CPPPath(G.OPENSSL_LIBS)
     end
 
@@ -1850 +1850 @@
     call lineout qmake_cache_new, ""
     if (DirExists(G.OutPath"\mkspecs\"G.XPLATFORM)) then
-       call lineout qmake_cache_new, 'QMAKESPEC = $$QT_BUILD_TREE\mkspecs\'G.XPLATFORM
+       call lineout qmake_cache_new, 'QMAKESPEC = $$QT_BUILD_TREE\\mkspecs\\'G.XPLATFORM
     else
        call lineout qmake_cache_new, 'QMAKESPEC = 'G.XPLATFORM

trunk/mkspecs/os2-g++/qmake.conf

@@ -107 +107 @@
 
 QMAKE_RUN_GENDEF            = \
-    $(QMAKESPECDIR)\emxexpw.cmd -name $(basename $(TARGET)) \
+    $(QMAKESPECDIR)\\emxexpw.cmd -name $(basename $(TARGET)) \
         -def $(DEF_FILE) \
         $(if $(DEF_FILE_VERSION),-version \"$(DEF_FILE_VERSION)\") \
@@ -136 +136 @@
     QMAKE_DIR_SEP       = /
     QMAKE_COPY          = cp
-    QMAKE_COPY_DIR      = \"$(QMAKESPECDIR)\cpdir.cmd\"
+    QMAKE_COPY_DIR      = \"$(QMAKESPECDIR)/cpdir.cmd\"
     QMAKE_MOVE          = mv
     QMAKE_DEL_FILE      = rm
@@ -144 +144 @@
 } else {
     QMAKE_COPY          = copy
-    QMAKE_COPY_DIR      = \"$(QMAKESPECDIR)\cpdir.cmd\"
+    QMAKE_COPY_DIR      = \"$(QMAKESPECDIR)\\cpdir.cmd\"
     QMAKE_MOVE          = move
     QMAKE_DEL_FILE      = del
-    QMAKE_MKDIR         = \"$(QMAKESPECDIR)\mkdir-p.cmd\"
+    QMAKE_MKDIR         = \"$(QMAKESPECDIR)\\mkdir-p.cmd\"
     QMAKE_DEL_DIR       = rmdir
     QMAKE_CHK_DIR_EXISTS    = if not exist