From fe2f8146d43c769392953cf55014e53510a0ce2b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 6 Dec 2016 18:49:53 +0100 Subject: prune vestiges of DEPLOYMENT_PLUGIN the code was broken since 5.0, as it still hardcoded the version number 4 for the plugin basenames. wince is not supported any more, so there is no point in trying to restore the code to function. at a later point, we'll make QTPLUGIN universal enough to cover both static and dynamic deployment. Change-Id: I0911ce4aff7a799dd471d6218e046f13dca6d49e Reviewed-by: Jake Petroules Reviewed-by: Joerg Bornemann Reviewed-by: Andy Shaw --- qmake/doc/snippets/code/doc_src_qmake-manual.pro | 4 ---- 1 file changed, 4 deletions(-) (limited to 'qmake/doc/snippets/code/doc_src_qmake-manual.pro') diff --git a/qmake/doc/snippets/code/doc_src_qmake-manual.pro b/qmake/doc/snippets/code/doc_src_qmake-manual.pro index c3b6e6595f..1710826f2d 100644 --- a/qmake/doc/snippets/code/doc_src_qmake-manual.pro +++ b/qmake/doc/snippets/code/doc_src_qmake-manual.pro @@ -784,10 +784,6 @@ CONFIG(debug, debug|release) { } #! [127] -#! [142] -DEPLOYMENT_PLUGIN += qjpeg -#! [142] - #! [149] SUBDIRS += my_executable my_library my_executable.subdir = app -- cgit v1.2.3 From afbdf20fed389fe56a948d166c7c62693f04ba6c Mon Sep 17 00:00:00 2001 From: Kavindra Palaraja Date: Tue, 3 Jan 2017 21:31:22 +0100 Subject: Fixed docs explaining the Frameworks usage Used the correct variable Task-number: QTBUG-48941 Change-Id: I832fa40d27ebba8e1787d5a8e819b9f5c17cf721 Reviewed-by: Oswald Buddenhagen --- qmake/doc/snippets/code/doc_src_qmake-manual.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qmake/doc/snippets/code/doc_src_qmake-manual.pro') diff --git a/qmake/doc/snippets/code/doc_src_qmake-manual.pro b/qmake/doc/snippets/code/doc_src_qmake-manual.pro index 1710826f2d..8ba0aa0713 100644 --- a/qmake/doc/snippets/code/doc_src_qmake-manual.pro +++ b/qmake/doc/snippets/code/doc_src_qmake-manual.pro @@ -120,7 +120,7 @@ qmake -spec macx-g++ #! [14] -QMAKE_LFLAGS += -F/path/to/framework/directory/ +LIBS += -F/path/to/framework/directory/ #! [14] -- cgit v1.2.3