diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-14 19:23:12 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-17 15:36:18 +0100 |
| commit | 0535c8da3b96e3300a25fe4c1603796f7520cfe4 (patch) | |
| tree | 8fafb207cad80f6d450f53e2c14663b68727463f | |
| parent | d2b5e049b58a126f1818c2ac934118fa8c0c3545 (diff) | |
remove some unnecessary CONFIG additions
qt is already added by spec_pre.prf, warn_on by default_pre.prf.
Change-Id: I7eb442aca5ebd469c278cdfb4d0bc0e4c3c54fa7
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| -rw-r--r-- | doc/src/development/qmake-manual.qdoc | 6 | ||||
| -rw-r--r-- | doc/src/snippets/code/doc_src_qmake-manual.pro | 11 | ||||
| -rw-r--r-- | doc/src/snippets/widget-mask/widget-mask.pro | 1 |
3 files changed, 5 insertions, 13 deletions
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc index f3f11fd73..89d07cc80 100644 --- a/doc/src/development/qmake-manual.qdoc +++ b/doc/src/development/qmake-manual.qdoc @@ -4181,12 +4181,6 @@ \snippet doc/src/snippets/code/doc_src_qmake-manual.pro 112 - The final step is to set the \l{qmake Variable Reference#CONFIG}{CONFIG} - variable. Since this is a Qt application, we need to put \c qt on the - \c CONFIG line so that \l{qmake Manual#qmake}{\c qmake} will add the - relevant libraries to be linked against and ensure that build lines for - \c moc and \c uic are included in the generated Makefile. - The finished project file should look like this: \snippet doc/src/snippets/code/doc_src_qmake-manual.pro 113 diff --git a/doc/src/snippets/code/doc_src_qmake-manual.pro b/doc/src/snippets/code/doc_src_qmake-manual.pro index 240632bf3..2417a6e0d 100644 --- a/doc/src/snippets/code/doc_src_qmake-manual.pro +++ b/doc/src/snippets/code/doc_src_qmake-manual.pro @@ -692,7 +692,6 @@ TARGET = helloworld #! [113] -CONFIG += qt HEADERS += hello.h SOURCES += hello.cpp SOURCES += main.cpp @@ -710,7 +709,7 @@ qmake -tp vc hello.pro #! [116] -CONFIG += qt debug +CONFIG += debug HEADERS += hello.h SOURCES += hello.cpp SOURCES += main.cpp @@ -725,7 +724,7 @@ win32 { #! [118] -CONFIG += qt debug +CONFIG += debug HEADERS += hello.h SOURCES += hello.cpp SOURCES += main.cpp @@ -746,7 +745,7 @@ unix { #! [120] -CONFIG += qt debug +CONFIG += debug HEADERS += hello.h SOURCES += hello.cpp SOURCES += main.cpp @@ -772,7 +771,7 @@ win32 { #! [122] -CONFIG += qt debug +CONFIG += debug HEADERS += hello.h SOURCES += hello.cpp SOURCES += main.cpp @@ -798,7 +797,7 @@ HEADERS += hello.h SOURCES += hello.cpp SOURCES += main.cpp DEFINES += USE_MY_STUFF -CONFIG += qt warn_on release +CONFIG += release #! [123] diff --git a/doc/src/snippets/widget-mask/widget-mask.pro b/doc/src/snippets/widget-mask/widget-mask.pro index f0807a5e1..f06374780 100644 --- a/doc/src/snippets/widget-mask/widget-mask.pro +++ b/doc/src/snippets/widget-mask/widget-mask.pro @@ -1,3 +1,2 @@ SOURCES = main.cpp RESOURCES = mask.qrc -CONFIG += qt |