Changeset 561 for trunk/tools/qdoc3/qdoc3.pro

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/qdoc3/qdoc3.pro (modified) (2 diffs)

trunk/tools/qdoc3/qdoc3.pro

@@ -1 +1 @@
 DEFINES += QDOC2_COMPAT
-#DEFINES += QT_NO_CAST_TO_ASCII
+DEFINES += QT_NO_CAST_TO_ASCII
 #DEFINES += QT_NO_CAST_FROM_ASCII
+#DEFINES += QT_USE_FAST_OPERATOR_PLUS
+#DEFINES += QT_USE_FAST_CONCATENATION
 
 QT = core xml
 CONFIG += console
+CONFIG -= debug_and_release_target
+!isEmpty(QT_BUILD_TREE):DESTDIR = $$QT_BUILD_TREE/bin
+#CONFIG += debug
 build_all:!build_pass {
     CONFIG -= build_all
     CONFIG += release
+#    CONFIG += debug
 }
 mac:CONFIG -= app_bundle
@@ -100 +106 @@
            yyindent.cpp
 
-
-win32 {
-    QT_WINCONFIG = release
-    CONFIG(debug, debug|release) {
-        QT_WINCONFIG = debug
-    }    
-}
+target.path = $$[QT_INSTALL_BINS]
+INSTALLS += target