diff options
| -rw-r--r-- | demos/arthurplugin/arthurplugin.pro | 2 | ||||
| -rw-r--r-- | examples/designer/containerextension/containerextension.pro | 2 | ||||
| -rw-r--r-- | examples/designer/customwidgetplugin/customwidgetplugin.pro | 2 | ||||
| -rw-r--r-- | examples/designer/taskmenuextension/taskmenuextension.pro | 2 | ||||
| -rw-r--r-- | examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro | 2 | ||||
| -rw-r--r-- | modules/qt_clucene.pri | 1 | ||||
| -rw-r--r-- | modules/qt_designer.pri | 1 | ||||
| -rw-r--r-- | modules/qt_help.pri | 1 | ||||
| -rw-r--r-- | src/designer/src/plugins/activeqt/activeqt.pro | 2 | ||||
| -rw-r--r-- | src/designer/src/plugins/plugins.pri | 2 |
10 files changed, 10 insertions, 7 deletions
diff --git a/demos/arthurplugin/arthurplugin.pro b/demos/arthurplugin/arthurplugin.pro index 325569965..3460eb4d8 100644 --- a/demos/arthurplugin/arthurplugin.pro +++ b/demos/arthurplugin/arthurplugin.pro @@ -4,7 +4,7 @@ QTDIR = $$QT_SOURCE_TREE CONFIG += designer plugin TEMPLATE = lib TARGET = $$qtLibraryTarget(arthurplugin) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer +DESTDIR = $$QT.designer.plugins/designer contains(QT_CONFIG, opengl) { DEFINES += QT_OPENGL_SUPPORT diff --git a/examples/designer/containerextension/containerextension.pro b/examples/designer/containerextension/containerextension.pro index 32785ab72..1c3cfd785 100644 --- a/examples/designer/containerextension/containerextension.pro +++ b/examples/designer/containerextension/containerextension.pro @@ -5,7 +5,7 @@ TARGET = $$qtLibraryTarget($$TARGET) #! [1] CONFIG += designer plugin #! [1] -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer +DESTDIR = $$QT.designer.plugins/designer #! [2] HEADERS += multipagewidget.h \ diff --git a/examples/designer/customwidgetplugin/customwidgetplugin.pro b/examples/designer/customwidgetplugin/customwidgetplugin.pro index ae855323d..450a8a64c 100644 --- a/examples/designer/customwidgetplugin/customwidgetplugin.pro +++ b/examples/designer/customwidgetplugin/customwidgetplugin.pro @@ -5,7 +5,7 @@ TARGET = $$qtLibraryTarget($$TARGET) #! [2] TEMPLATE = lib #! [1] #! [2] -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer +DESTDIR = $$QT.designer.plugins/designer #! [3] HEADERS = analogclock.h \ diff --git a/examples/designer/taskmenuextension/taskmenuextension.pro b/examples/designer/taskmenuextension/taskmenuextension.pro index aa5720792..51a1716f2 100644 --- a/examples/designer/taskmenuextension/taskmenuextension.pro +++ b/examples/designer/taskmenuextension/taskmenuextension.pro @@ -5,7 +5,7 @@ TARGET = $$qtLibraryTarget($$TARGET) #! [1] CONFIG += designer plugin #! [1] -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer +DESTDIR = $$QT.designer.plugins/designer #! [2] HEADERS += tictactoe.h \ diff --git a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro index fa77d8626..bf9c869eb 100644 --- a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro +++ b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro @@ -5,7 +5,7 @@ TARGET = $$qtLibraryTarget($$TARGET) #! [1] TEMPLATE = lib #! [1] -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer +DESTDIR = $$QT.designer.plugins/designer #! [2] HEADERS = worldtimeclock.h \ diff --git a/modules/qt_clucene.pri b/modules/qt_clucene.pri index 7f7c56b89..a7e9f5458 100644 --- a/modules/qt_clucene.pri +++ b/modules/qt_clucene.pri @@ -9,5 +9,6 @@ QT.clucene.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtCLucen QT.clucene.private_includes = $$QT_MODULE_INCLUDE_BASE/QtCLucene/private QT.clucene.sources = $$QT_MODULE_BASE/src/assistant/lib/fulltextsearch QT.clucene.libs = $$QT_MODULE_LIB_BASE +QT.clucene.plugins = $$QT_MODULE_PLUGIN_BASE QT.clucene.imports = $$QT_MODULE_IMPORT_BASE QT.clucene.depends = core diff --git a/modules/qt_designer.pri b/modules/qt_designer.pri index 913866f13..c44e69fa5 100644 --- a/modules/qt_designer.pri +++ b/modules/qt_designer.pri @@ -9,6 +9,7 @@ QT.designer.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtDesig QT.designer.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDesigner/private QT.designer.sources = $$QT_MODULE_BASE/src/designer/src/lib QT.designer.libs = $$QT_MODULE_LIB_BASE +QT.designer.plugins = $$QT_MODULE_PLUGIN_BASE QT.designer.imports = $$QT_MODULE_IMPORT_BASE QT.designer.depends = xml QT.designer.DEFINES = QT_DESIGNER_LIB diff --git a/modules/qt_help.pri b/modules/qt_help.pri index bc5481fc2..fd387c5a0 100644 --- a/modules/qt_help.pri +++ b/modules/qt_help.pri @@ -9,6 +9,7 @@ QT.help.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtHelp QT.help.private_includes = $$QT_MODULE_INCLUDE_BASE/QtHelp/private QT.help.sources = $$QT_MODULE_BASE/src/assistant/lib QT.help.libs = $$QT_MODULE_LIB_BASE +QT.help.plugins = $$QT_MODULE_PLUGIN_BASE QT.help.imports = $$QT_MODULE_IMPORT_BASE QT.help.depends = network xml sql QT.help.DEFINES = QT_HELP_LIB diff --git a/src/designer/src/plugins/activeqt/activeqt.pro b/src/designer/src/plugins/activeqt/activeqt.pro index d71e38756..2ed0b1071 100644 --- a/src/designer/src/plugins/activeqt/activeqt.pro +++ b/src/designer/src/plugins/activeqt/activeqt.pro @@ -1,6 +1,6 @@ TARGET = $$qtLibraryTarget(qaxwidget) TEMPLATE = lib -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer +DESTDIR = $$QT.designer.plugins/designer CONFIG += qt warn_on qaxcontainer plugin designer debug_and_release build_all:!build_pass { diff --git a/src/designer/src/plugins/plugins.pri b/src/designer/src/plugins/plugins.pri index e2fcfc4f7..2801e5b68 100644 --- a/src/designer/src/plugins/plugins.pri +++ b/src/designer/src/plugins/plugins.pri @@ -1,6 +1,6 @@ CONFIG += designer win32|mac: CONFIG+= debug_and_release -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer +DESTDIR = $$QT.designer.plugins/designer contains(TEMPLATE, ".*lib"):TARGET = $$qtLibraryTarget($$TARGET) # install |