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

Merge branch 'buildsystem' 

Change-Id: I230e776290761be7c811c3aec4d915367012fc99
This commit is contained in:
Oswald Buddenhagen 2012-06-26 17:59:46 +02:00
parent bdefc3a2a8 489651ef7f
commit 4189a0d294
27 changed files with 60 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
examples/examples.pro
View File

@ -1,3 +1,11 @@
TEMPLATE = subdirs
SUBDIRS += demos shared localstorage particles qml quick tutorials window
contains(QT_CONFIG, qmltest): SUBDIRS += qmltest
SUBDIRS += \
demos \
shared \
localstorage \
particles \
qml \
quick \
tutorials \
window \
qmltest

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

17
modules/qt_qml.pri
View File

@ -1,17 +0,0 @@
QT.qml.VERSION = 5.0.0
QT.qml.MAJOR_VERSION = 5
QT.qml.MINOR_VERSION = 0
QT.qml.PATCH_VERSION = 0
QT.qml.name = QtQml
QT.qml.bins = $$QT_MODULE_BIN_BASE
QT.qml.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtQml
QT.qml.private_includes = $$QT_MODULE_INCLUDE_BASE/QtQml/$$QT.qml.VERSION
QT.qml.sources = $$QT_MODULE_BASE/src/qml
QT.qml.libs = $$QT_MODULE_LIB_BASE
QT.qml.plugins = $$QT_MODULE_PLUGIN_BASE
QT.qml.imports = $$QT_MODULE_IMPORT_BASE
QT.qml.depends = network
QT.qml.DEFINES = QT_QML_LIB QQmlImageProvider=QQuickImageProvider
QT_CONFIG += qml

19
modules/qt_qmldevtools.pri
View File

@ -1,19 +0,0 @@
QT.qmldevtools.VERSION = 5.0.0
QT.qmldevtools.MAJOR_VERSION = 5
QT.qmldevtools.MINOR_VERSION = 0
QT.qmldevtools.PATCH_VERSION = 0
QT.qmldevtools.name = QtQmlDevTools
QT.qmldevtools.bins = $$QT_MODULE_BIN_BASE
QT.qmldevtools.includes = $$QT_MODULE_INCLUDE_BASE/QtQmlDevTools
QT.qmldevtools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtQmlDevTools/$$QT.qmldevtools.VERSION
QT.qmldevtools.sources = $$QT_MODULE_BASE/src/qmldevtools
QT.qmldevtools.libs = $$QT_MODULE_LIB_BASE
QT.qmldevtools.plugins = $$QT_MODULE_PLUGIN_BASE
QT.qmldevtools.imports = $$QT_MODULE_IMPORT_BASE
QT.qmldevtools.depends = core
QT.qmldevtools.module_config = staticlib
QT.qmldevtools.DEFINES = QT_QMLDEVTOOLS_LIB
QT_CONFIG += qmldevtools

17
modules/qt_qmltest.pri
View File

@ -1,17 +0,0 @@
QT.qmltest.VERSION = 5.0.0
QT.qmltest.MAJOR_VERSION = 5
QT.qmltest.MINOR_VERSION = 0
QT.qmltest.PATCH_VERSION = 0
QT.qmltest.name = QtQuickTest
QT.qmltest.bins = $$QT_MODULE_BIN_BASE
QT.qmltest.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtQuickTest
QT.qmltest.private_includes = $$QT_MODULE_INCLUDE_BASE/QtQuickTest/$$QT.qmltest.VERSION
QT.qmltest.sources = $$QT_MODULE_BASE/src/qmltest
QT.qmltest.libs = $$QT_MODULE_LIB_BASE
QT.qmltest.plugins = $$QT_MODULE_PLUGIN_BASE
QT.qmltest.imports = $$QT_MODULE_IMPORT_BASE
QT.qmltest.depends = qml testlib
QT.qmltest.DEFINES = QT_QMLTEST_LIB
QT_CONFIG += qmltest

17
modules/qt_quick.pri
View File

@ -1,17 +0,0 @@
QT.quick.VERSION = 5.0.0
QT.quick.MAJOR_VERSION = 5
QT.quick.MINOR_VERSION = 0
QT.quick.PATCH_VERSION = 0
QT.quick.name = QtQuick
QT.quick.bins = $$QT_MODULE_BIN_BASE
QT.quick.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtQuick
QT.quick.private_includes = $$QT_MODULE_INCLUDE_BASE/QtQuick/$$QT.quick.VERSION
QT.quick.sources = $$QT_MODULE_BASE/src/quick
QT.quick.libs = $$QT_MODULE_LIB_BASE
QT.quick.plugins = $$QT_MODULE_PLUGIN_BASE
QT.quick.imports = $$QT_MODULE_IMPORT_BASE
QT.quick.depends = qml gui
QT.quick.DEFINES = QT_QUICK_LIB
QT_CONFIG += quick

17
modules/qt_quickparticles.pri
View File

@ -1,17 +0,0 @@
QT.quickparticles.VERSION = 5.0.0
QT.quickparticles.MAJOR_VERSION = 5
QT.quickparticles.MINOR_VERSION = 0
QT.quickparticles.PATCH_VERSION = 0
QT.quickparticles.name = QtQuickParticles
QT.quickparticles.bins = $$QT_MODULE_BIN_BASE
QT.quickparticles.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtQuickParticles
QT.quickparticles.private_includes = $$QT_MODULE_INCLUDE_BASE/QtQuickParticles/$$QT.quickparticles.VERSION
QT.quickparticles.sources = $$QT_MODULE_BASE/src/particles
QT.quickparticles.libs = $$QT_MODULE_LIB_BASE
QT.quickparticles.plugins = $$QT_MODULE_PLUGIN_BASE
QT.quickparticles.imports = $$QT_MODULE_IMPORT_BASE
QT.quickparticles.depends = qml quick
QT.quickparticles.DEFINES = QT_QUICKPARTICLES_LIB
QT_CONFIG += quickparticles

9
src/imports/imports.pro
View File

@ -1,5 +1,10 @@
TEMPLATE = subdirs
SUBDIRS += qtquick2 particles window folderlistmodel localstorage
contains(QT_CONFIG, qmltest): SUBDIRS += testlib
SUBDIRS += \
qtquick2 \
particles \
window \
folderlistmodel \
localstorage \
testlib
contains(QT_CONFIG, xmlpatterns) : SUBDIRS += xmllistmodel

6
src/particles/particles.pro
View File

@ -1,14 +1,12 @@
load(qt_module)
load(qt_build_config)
TARGET = QtQuickParticles
CONFIG += module
CONFIG += dll warn_on
MODULE_PRI = ../../modules/qt_quickparticles.pri
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/particles/qtquickparticlesglobal_p.h
View File

@ -48,7 +48,7 @@
#if defined(Q_OS_WIN)
# if defined(QT_MAKEDLL) /* create a Qt DLL library */
# if defined(QT_BUILD_QUICKPARTICLES_LIB)
# if defined(QT_BUILD_PARTICLES_LIB)
# define Q_QUICKPARTICLES_PRIVATE_EXPORT Q_DECL_EXPORT
# else
# define Q_QUICKPARTICLES_PRIVATE_EXPORT Q_DECL_IMPORT

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

@ -3,7 +3,7 @@ QT += qml network
load(qt_plugin)
QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/qmltooling
QTDIR_build:DESTDIR = $$QT.qml.plugins/qmltooling
QTDIR_build:REQUIRES += "contains(QT_CONFIG, qml)"
SOURCES += \

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

18
src/qml/qml.pro
View File

@ -1,26 +1,20 @@
load(qt_module)
load(qt_build_config)
TARGET = QtQml
QPRO_PWD = $$PWD
CONFIG += module
MODULE_PRI += ../../modules/qt_qml.pri
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
}
MODULE_DEFINES = QQmlImageProvider=QQuickImageProvider
load(qt_module_config)
QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf
@ -28,13 +22,9 @@ QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf
# 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)

4
src/qml/qml/ftw/ftw.pri
View File

@ -24,4 +24,6 @@ SOURCES += \
$$PWD/qqmlthread.cpp \
$$PWD/qqmltrace.cpp \
contains(QT_CONFIG, clock-gettime):include($$QT_SOURCE_TREE/config.tests/unix/clock-gettime/clock-gettime.pri)
# mirrors logic in $$QT_SOURCE_TREE/config.tests/unix/clock-gettime/clock-gettime.pri
# clock_gettime() is implemented in librt on these systems
contains(QT_CONFIG, clock-gettime):linux-*|hpux-*|solaris-*:LIBS_PRIVATE *= -lrt

15
src/qmldevtools/qmldevtools.pro
View File

@ -1,20 +1,9 @@
load(qt_module)
load(qt_build_config)
TARGET = QtQmlDevTools
QT = core
TEMPLATE = lib
DESTDIR = $$QMAKE_LIBDIR_QT
CONFIG += module
CONFIG += staticlib
MODULE_PRI = ../../modules/qt_qmldevtools.pri
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)

16
src/qmltest/qmltest.pro
View File

@ -1,14 +1,10 @@
load(qt_module)
load(qt_build_config)
TARGET = QtQuickTest
QPRO_PWD = $$PWD
CONFIG += module
CONFIG += dll warn_on
MODULE_PRI += ../../modules/qt_qmltest.pri
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)
@ -21,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 \
@ -35,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

2
src/qmltest/quicktestglobal.h
View File

@ -54,7 +54,7 @@ QT_BEGIN_HEADER
# if defined(QT_DLL)
# undef QT_DLL
# endif
# if defined(QT_BUILD_QUICK_TEST_LIB)
# if defined(QT_BUILD_QMLTEST_LIB)
# define Q_QUICK_TEST_EXPORT Q_DECL_EXPORT
# else
# define Q_QUICK_TEST_EXPORT Q_DECL_IMPORT

6
src/quick/quick.pro
View File

@ -1,14 +1,12 @@
load(qt_module)
load(qt_build_config)
TARGET = QtQuick
CONFIG += module
CONFIG += dll warn_on
MODULE_PRI = ../../modules/qt_quick.pri
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

14
src/src.pro
View File

@ -1,8 +1,10 @@
TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS += qml quick particles plugins
contains(QT_CONFIG, qmltest): SUBDIRS += qmltest
SUBDIRS += imports
SUBDIRS += qmldevtools
SUBDIRS += \
qml \
quick \
qmltest \
particles \
plugins \
imports \
qmldevtools

17
sync.profile
View File

@ -8,23 +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",
);
%modulepris = (
"QtQml" => "$basedir/modules/qt_qml.pri",
"QtQuick" => "$basedir/modules/qt_quick.pri",
"QtQuickParticles" => "$basedir/modules/qt_quickparticles.pri",
"QtQuickTest" => "$basedir/modules/qt_qmltest.pri",
"QtQmlDevTools" => "$basedir/modules/qt_qmldevtools.pri",
);
%deprecatedheaders = (
"QtQml" => {
"QQmlImageProvider" => "QtQuick/QQuickImageProvider",

3
tests/auto/auto.pro
View File

@ -4,8 +4,7 @@ SUBDIRS=\
quick \
headersclean \
particles \
qmltest \
qmldevtools
testcocoon: SUBDIRS -= headersclean
contains(QT_CONFIG, qmltest): SUBDIRS += qmltest

2
tests/auto/quick/qquickaccessible/qquickaccessible.pro
View File

@ -18,7 +18,7 @@ OTHER_FILES += data/statictext.qml
CONFIG += parallel_test
wince*: {
accessneeded.files = $$QT_BUILD_TREE\\plugins\\accessible\\*.dll
accessneeded.files = $$QT.widgets.plugins/accessible/*.dll
accessneeded.path = accessible
DEPLOYMENT += accessneeded
}

4
tools/easingcurveeditor/easingcurveeditor.pro
View File

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

4
tools/easingcurveeditor/main.cpp
View File

@ -39,9 +39,9 @@
**
****************************************************************************/
#include <QApplication>
#include <mainwindow.h>
#include "mainwindow.h"
#include <QApplication>
int main(int argc, char ** argv)
{

2
tools/easingcurveeditor/splineeditor.cpp
View File

@ -40,13 +40,13 @@
****************************************************************************/
#include "splineeditor.h"
#include "segmentproperties.h"
#include <QPainter>
#include <QMouseEvent>
#include <QContextMenuEvent>
#include <QDebug>
#include <QApplication>
#include <segmentproperties.h>
const int canvasWidth = 640;
const int canvasHeight = 320;

10
tools/tools.pro
View File

@ -1,6 +1,12 @@
TEMPLATE = subdirs
SUBDIRS += qmlscene qmlplugindump qmlmin qmleasing qmlprofiler qmlbundle
SUBDIRS += \
qmlscene \
qmlplugindump \
qmlmin \
qmleasing \
qmlprofiler \
qmlbundle \
qmltestrunner
!contains(QT_CONFIG, no-widgets):SUBDIRS += easingcurveeditor
contains(QT_CONFIG, qmltest): SUBDIRS += qmltestrunner