diff options
| author | Yuchen Deng <loaden@gmail.com> | 2012-09-21 20:15:17 +0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-26 15:01:05 +0200 |
| commit | 93f1e771b0fde9cd2e9f21b193a721e8ec2cb200 (patch) | |
| tree | 46e9742d57459ecad3bba5ff0d52001b9269b999 /src/designer/src/plugins | |
| parent | a3d38475cd6a3df0e47150b13842472e7819617c (diff) | |
| download | qttools-93f1e771b0fde9cd2e9f21b193a721e8ec2cb200.tar.gz | |
Build tools in release mode if using -debug-and-release option
Change-Id: I2d0f60e2fcba66460f5488c6f66432b76a06f05a
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/designer/src/plugins')
| -rw-r--r-- | src/designer/src/plugins/activeqt/activeqt.pro | 4 | ||||
| -rw-r--r-- | src/designer/src/plugins/plugins.pri | 2 | ||||
| -rw-r--r-- | src/designer/src/plugins/qwebview/qwebview.pro | 4 | ||||
| -rw-r--r-- | src/designer/src/plugins/tools/view3d/view3d.pro | 4 |
4 files changed, 1 insertions, 13 deletions
diff --git a/src/designer/src/plugins/activeqt/activeqt.pro b/src/designer/src/plugins/activeqt/activeqt.pro index 5fa437369..7902c95cb 100644 --- a/src/designer/src/plugins/activeqt/activeqt.pro +++ b/src/designer/src/plugins/activeqt/activeqt.pro @@ -5,10 +5,6 @@ CONFIG += qaxcontainer qt warn_on plugin designer QT += widgets designer-private include(../plugins.pri) -build_all:!build_pass { - CONFIG -= build_all - CONFIG += release -} INCLUDEPATH += $$QT.activeqt.sources/shared/ \ $$QT.activeqt.sources/container \ diff --git a/src/designer/src/plugins/plugins.pri b/src/designer/src/plugins/plugins.pri index 2801e5b68..c0c7a8fa8 100644 --- a/src/designer/src/plugins/plugins.pri +++ b/src/designer/src/plugins/plugins.pri @@ -1,5 +1,5 @@ CONFIG += designer -win32|mac: CONFIG+= debug_and_release +!build_pass:contains(QT_CONFIG, build_all): CONFIG += release DESTDIR = $$QT.designer.plugins/designer contains(TEMPLATE, ".*lib"):TARGET = $$qtLibraryTarget($$TARGET) diff --git a/src/designer/src/plugins/qwebview/qwebview.pro b/src/designer/src/plugins/qwebview/qwebview.pro index 50fc69923..f5fe431a2 100644 --- a/src/designer/src/plugins/qwebview/qwebview.pro +++ b/src/designer/src/plugins/qwebview/qwebview.pro @@ -4,10 +4,6 @@ CONFIG += qt warn_on plugin QT += widgets webkit include(../plugins.pri) -build_all:!build_pass { - CONFIG -= build_all - CONFIG += release -} SOURCES += qwebview_plugin.cpp HEADERS += qwebview_plugin.h diff --git a/src/designer/src/plugins/tools/view3d/view3d.pro b/src/designer/src/plugins/tools/view3d/view3d.pro index 5c27ea7c5..82baf4750 100644 --- a/src/designer/src/plugins/tools/view3d/view3d.pro +++ b/src/designer/src/plugins/tools/view3d/view3d.pro @@ -5,10 +5,6 @@ CONFIG += qt warn_on plugin designer TARGET = view3d include(../../plugins.pri) -build_all:!build_pass { - CONFIG -= build_all - CONFIG += release -} SOURCES += view3d.cpp view3d_tool.cpp view3d_plugin.cpp HEADERS += view3d.h view3d_tool.h view3d_plugin.h view3d_global.h |