From e2c05ca8b3764ac85cc908b96add832995e8f4d4 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 26 Nov 2012 16:07:04 +0200 Subject: Remove obsolete QT_DLL and QT_NODLL usage These defines are old compatiblity defines and are no longer supposed to be used. Usage in examples doesn't do anything currently, so removed it entirely. Task-number: QTBUG-28181 Change-Id: I98db88e3ef9f98c70132cea986127ed883dd8503 Reviewed-by: Friedemann Kleint --- examples/activeqt/hierarchy/hierarchy.pro | 1 - examples/activeqt/multiple/multiple.pro | 2 -- examples/activeqt/wrapper/wrapper.pro | 2 -- 3 files changed, 5 deletions(-) (limited to 'examples') diff --git a/examples/activeqt/hierarchy/hierarchy.pro b/examples/activeqt/hierarchy/hierarchy.pro index 84ee712..9d4c665 100644 --- a/examples/activeqt/hierarchy/hierarchy.pro +++ b/examples/activeqt/hierarchy/hierarchy.pro @@ -2,7 +2,6 @@ TEMPLATE = lib TARGET = hierarchyax CONFIG += qt warn_off qaxserver dll -contains(CONFIG, static):DEFINES += QT_NODLL QT += widgets SOURCES = objects.cpp main.cpp diff --git a/examples/activeqt/multiple/multiple.pro b/examples/activeqt/multiple/multiple.pro index b5713b0..295376d 100644 --- a/examples/activeqt/multiple/multiple.pro +++ b/examples/activeqt/multiple/multiple.pro @@ -4,8 +4,6 @@ TARGET = multipleax CONFIG += qt warn_off qaxserver dll QT += widgets -contains(CONFIG, static):DEFINES += QT_NODLL - SOURCES = main.cpp HEADERS = ax1.h ax2.h RC_FILE = multipleax.rc diff --git a/examples/activeqt/wrapper/wrapper.pro b/examples/activeqt/wrapper/wrapper.pro index c1a736c..1d2c3ae 100644 --- a/examples/activeqt/wrapper/wrapper.pro +++ b/examples/activeqt/wrapper/wrapper.pro @@ -4,8 +4,6 @@ TARGET = wrapperax CONFIG += qt warn_off qaxserver dll QT += widgets -contains(CONFIG, static):DEFINES += QT_NODLL - SOURCES = main.cpp RC_FILE = wrapperax.rc DEF_FILE = wrapperax.def -- cgit v1.2.1