qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build system cleanups 

- load(qt_module) => load(qt_build_config)
- remove:
  - CONFIG+=module (obsolete)
  - setup of PKGCONFIG* variables (automated now)
  - code relating to module version headers (automated now)
  - %mastercontent assignment (automated now)
  - QT_BUILD_*_LIB defines (automated now)
  - pointless QPRO_PWD assignments
  - pointless and commented out include and depend paths
  - qmake -project boilerplate

Change-Id: Ib2d80a375e88bae1b50a22a274374b7e2cc2a86c
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-04-12 12:09:53 +02:00 committed by Qt by Nokia
parent 27416448a1
commit 489651ef7f
10 changed files with 15 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/quick/modelviews/abstractitemmodel/abstractitemmodel.pro
View File

@ -1,7 +1,4 @@
TEMPLATE = app
TARGET = abstractitemmodel
DEPENDPATH += .
INCLUDEPATH += .
QT += qml quick
HEADERS = model.h

5
src/particles/particles.pro
View File

@ -1,13 +1,12 @@
load(qt_module)
load(qt_build_config)
TARGET = QtQuickParticles
CONFIG += module
CONFIG += dll warn_on
QT = core-private gui-private qml-private quick-private
DEFINES += QT_BUILD_QUICKPARTICLES_LIB QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES
DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES
win32-msvc*:DEFINES *= _CRT_SECURE_NO_WARNINGS
solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2

2
src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
View File

@ -1,4 +1,4 @@
load(qt_module)
load(qt_build_config)
TARGET = qmldbg_qtquick2
QT += qml-private quick-private core-private gui-private v8-private

2
src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
View File

@ -1,4 +1,4 @@
load(qt_module)
load(qt_build_config)
TARGET = qmldbg_tcp
QT += qml-private network v8-private core-private

16
src/qml/qml.pro
View File

@ -1,20 +1,14 @@
load(qt_module)
load(qt_build_config)
TARGET = QtQml
QPRO_PWD = $$PWD
CONFIG += module
QT = core-private network
DEFINES += QT_BUILD_QML_LIB QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES
DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES
win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000
win32-msvc*:DEFINES *= _CRT_SECURE_NO_WARNINGS
solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
exists("qqml_enable_gcov") {
QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage -fno-elide-constructors
LIBS += -lgcov
@ -26,13 +20,9 @@ load(qt_module_config)
# private dependencies
QT += v8-private
HEADERS += qtqmlversion.h \
qtqmlglobal.h \
HEADERS += qtqmlglobal.h \
qtqmlglobal_p.h
#INCLUDEPATH -= $$QMAKE_INCDIR_QT/$$TARGET
#DESTDIR=.
#modules
include(util/util.pri)
include(qml/qml.pri)

13
src/qmldevtools/qmldevtools.pro
View File

@ -1,18 +1,9 @@
load(qt_module)
load(qt_build_config)
TARGET = QtQmlDevTools
QT = core
TEMPLATE = lib
DESTDIR = $$QMAKE_LIBDIR_QT
CONFIG += module
CONFIG += staticlib
DEFINES += QT_BUILD_QMLDEVTOOLS_LIB
load(qt_module_config)
HEADERS += qtqmldevtoolsversion.h
unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore
include(../qml/qml/parser/parser.pri)

15
src/qmltest/qmltest.pro
View File

@ -1,13 +1,10 @@
load(qt_module)
load(qt_build_config)
TARGET = QtQuickTest
QPRO_PWD = $$PWD
CONFIG += module
CONFIG += dll warn_on
QT += qml testlib-private gui-private
DEFINES += QT_BUILD_QUICK_TEST_LIB QT_NO_URL_CAST_FROM_STRING
DEFINES += QT_NO_URL_CAST_FROM_STRING
load(qt_module_config)
@ -20,9 +17,6 @@ feature.path = $$[QT_INSTALL_DATA]/mkspecs/features
feature.files = $$PWD/features/qmltestcase.prf
INSTALLS += feature
INCLUDEPATH += $$PWD/QtQuickTest
INCLUDEPATH += $$PWD
SOURCES += \
$$PWD/quicktest.cpp \
$$PWD/quicktestevent.cpp \
@ -34,5 +28,4 @@ HEADERS += \
$$PWD/quicktestresult_p.h \
$$PWD/qtestoptions_p.h
DEFINES += QT_BUILD_QUICK_TEST_LIB QT_QML_DEBUG_NO_WARNING
DEFINES += QT_QML_DEBUG_NO_WARNING

5
src/quick/quick.pro
View File

@ -1,13 +1,12 @@
load(qt_module)
load(qt_build_config)
TARGET = QtQuick
CONFIG += module
CONFIG += dll warn_on
QT = core-private gui-private qml-private
DEFINES += QT_BUILD_QUICK_LIB QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES
DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES
win32-msvc*:DEFINES *= _CRT_SECURE_NO_WARNINGS
solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2

10
sync.profile
View File

@ -8,16 +8,6 @@
%moduleheaders = ( # restrict the module headers to those found in relative path
"QtQmlDevTools" => "../qml/qml/parser",
);
%classnames = (
"qtqmlversion.h" => "QtQmlVersion",
);
%mastercontent = (
"gui" => "#include <QtGui/QtGui>\n",
"network" => "#include <QtNetwork/QtNetwork>\n",
"testlib" => "#include <QtTest/QtTest>\n",
"qml" => "#include <QtQml/QtQml>\n",
"quick" => "#include <QtQuick/QtQuick>\n",
);
%deprecatedheaders = (
"QtQml" => {
"QQmlImageProvider" => "QtQuick/QQuickImageProvider",

4
tools/easingcurveeditor/easingcurveeditor.pro
View File

@ -1,7 +1,3 @@
TEMPLATE = app
DEPENDPATH += .
INCLUDEPATH += .
QT += qml quick widgets
CONFIG -= app_bundle