From f9a917eb2a0002cdba84964f481930992fdc518d Mon Sep 17 00:00:00 2001 From: dt <qtc-commiter@nokia.com> Date: Thu, 18 Dec 2008 16:19:50 +0100 Subject: [PATCH] Fixes: Move qt version check to qtcreator.pro RevBy: con --- qtcreator.pro | 8 ++++++++ src/plugins/designer/designer.pro | 5 ----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/qtcreator.pro b/qtcreator.pro index 13f0b26fa3e..6c5d876731c 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -1,3 +1,11 @@ +#version check qt +TOO_OLD_LIST=$$find(QT_VERSION, ^4\.[0-4]) +count(TOO_OLD_LIST, 1) { + message("Cannot build the Qt Creator with a Qt version that old:" $$QT_VERSION) + error("Use at least Qt 4.5.") +} + + TEMPLATE = subdirs CONFIG += ordered diff --git a/src/plugins/designer/designer.pro b/src/plugins/designer/designer.pro index a039bf29915..7006e656148 100644 --- a/src/plugins/designer/designer.pro +++ b/src/plugins/designer/designer.pro @@ -6,11 +6,6 @@ include(../../../shared/designerintegrationv2/designerintegration.pri) include(cpp/cpp.pri) include(designer_dependencies.pri) -# -- check the Qt version -TOO_OLD_LIST=$$find(QT_VERSION, ^4\.[0-4]) -count(TOO_OLD_LIST, 1) { - error("Cannot build the designer plugin with a Qt version that old:" $$QT_VERSION) -} # -- figure out shared dir location !exists($$[QT_INSTALL_HEADERS]/QtDesigner/private/qdesigner_integration_p.h) { QT_SOURCE_TREE=$$fromfile($$(QTDIR)/.qmake.cache,QT_SOURCE_TREE) -- GitLab