From 74b7fb67b70903eb483288c44314fbc8aaeb6aa0 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 11 Jan 2011 08:40:22 +0100 Subject: [PATCH] Make tools compile. --- qttools/modules/qt_designer.pri | 10 ++++++++++ qttools/modules/qt_uitools.pri | 10 ++++++++++ .../src/assistant/tools/assistant/assistant.pro | 6 +++--- .../qcollectiongenerator/qcollectiongenerator.pro | 3 ++- .../tools/qhelpconverter/qhelpconverter.pro | 2 +- .../tools/qhelpgenerator/qhelpgenerator.pro | 2 +- qttools/src/designer/src/components/lib/lib.pro | 11 ++++++----- qttools/src/designer/src/designer/designer.pro | 3 ++- qttools/src/designer/src/lib/lib.pro | 9 ++++++--- qttools/src/designer/src/lib/shared/shared.pri | 2 +- qttools/src/linguist/linguist/linguist.pro | 5 ++++- qttools/src/linguist/lrelease/lrelease.pro | 6 ++++-- qttools/src/linguist/lupdate/lupdate.pro | 6 ++++-- qttools/src/qtconfig/qtconfig.pro | 2 ++ qttools/src/qttracereplay/qttracereplay.pro | 4 +++- qttools/src/src.pro | 3 +-- qttools/sync.profile | 13 +++++++++++++ 17 files changed, 73 insertions(+), 24 deletions(-) create mode 100644 qttools/modules/qt_designer.pri create mode 100644 qttools/modules/qt_uitools.pri diff --git a/qttools/modules/qt_designer.pri b/qttools/modules/qt_designer.pri new file mode 100644 index 0000000..8d7c513 --- /dev/null +++ b/qttools/modules/qt_designer.pri @@ -0,0 +1,10 @@ +QT_DESIGNER_VERSION = $$QT_VERSION +QT_DESIGNER_MAJOR_VERSION = $$QT_MAJOR_VERSION +QT_DESIGNER_MINOR_VERSION = $$QT_MINOR_VERSION +QT_DESIGNER_PATCH_VERSION = $$QT_PATCH_VERSION + +QT.designer.name = QtDesigner +QT.designer.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtDesigner +QT.designer.sources = $$QT_MODULE_BASE/src/designer/src/lib +QT.designer.libs = $$QT_MODULE_LIB_BASE +QT.designer.depends = xml diff --git a/qttools/modules/qt_uitools.pri b/qttools/modules/qt_uitools.pri new file mode 100644 index 0000000..516afef --- /dev/null +++ b/qttools/modules/qt_uitools.pri @@ -0,0 +1,10 @@ +QT_UITOOLS_VERSION = $$QT_VERSION +QT_UITOOLS_MAJOR_VERSION = $$QT_MAJOR_VERSION +QT_UITOOLS_MINOR_VERSION = $$QT_MINOR_VERSION +QT_UITOOLS_PATCH_VERSION = $$QT_PATCH_VERSION + +QT.uitools.name = QtUiTools +QT.uitools.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtUiTools +QT.uitools.sources = $$QT_MODULE_BASE/src/designer/src/uitools +QT.uitools.libs = $$QT_MODULE_LIB_BASE +QT.uitools.depends = xml diff --git a/qttools/src/assistant/tools/assistant/assistant.pro b/qttools/src/assistant/tools/assistant/assistant.pro index 7f0fdd1..dd79c10 100644 --- a/qttools/src/assistant/tools/assistant/assistant.pro +++ b/qttools/src/assistant/tools/assistant/assistant.pro @@ -1,3 +1,4 @@ +DEFINES += QT_NO_WEBKIT include(../../../shared/fontpanel/fontpanel.pri) TEMPLATE = app LANGUAGE = C++ @@ -6,14 +7,13 @@ contains(QT_CONFIG, webkit):QT += webkit CONFIG += qt \ warn_on \ help -QT += network +QT += network help PROJECTNAME = Assistant DESTDIR = ../../../../bin target.path = $$[QT_INSTALL_BINS] INSTALLS += target DEPENDPATH += ../shared -DEPENDPATH += . -INCLUDEPATH += . +INCLUDEPATH += $$QT.help.includes # ## Work around a qmake issue when statically linking to # ## not-yet-installed plugins diff --git a/qttools/src/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro b/qttools/src/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro index 98e6a31..66e920f 100644 --- a/qttools/src/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro +++ b/qttools/src/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro @@ -1,5 +1,6 @@ QT += xml \ - network + network \ + help TEMPLATE = app DESTDIR = ../../../../bin TARGET = qcollectiongenerator diff --git a/qttools/src/assistant/tools/qhelpconverter/qhelpconverter.pro b/qttools/src/assistant/tools/qhelpconverter/qhelpconverter.pro index 341faf3..ce3083e 100644 --- a/qttools/src/assistant/tools/qhelpconverter/qhelpconverter.pro +++ b/qttools/src/assistant/tools/qhelpconverter/qhelpconverter.pro @@ -1,4 +1,4 @@ -QT += xml +QT += xml help TEMPLATE = app TARGET = qhelpconverter DESTDIR = ../../../../bin diff --git a/qttools/src/assistant/tools/qhelpgenerator/qhelpgenerator.pro b/qttools/src/assistant/tools/qhelpgenerator/qhelpgenerator.pro index 68efcf5..82bec1d 100644 --- a/qttools/src/assistant/tools/qhelpgenerator/qhelpgenerator.pro +++ b/qttools/src/assistant/tools/qhelpgenerator/qhelpgenerator.pro @@ -3,7 +3,7 @@ TARGET = qhelpgenerator DESTDIR = ../../../../bin CONFIG += qt warn_on help console CONFIG -= app_bundle -QT += network +QT += network help target.path=$$[QT_INSTALL_BINS] INSTALLS += target diff --git a/qttools/src/designer/src/components/lib/lib.pro b/qttools/src/designer/src/components/lib/lib.pro index 50a8b00..165315e 100644 --- a/qttools/src/designer/src/components/lib/lib.pro +++ b/qttools/src/designer/src/components/lib/lib.pro @@ -1,12 +1,13 @@ +load(qt_module) + TEMPLATE = lib TARGET = QtDesignerComponents contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols CONFIG += qt depend_prl no_objective_c designer win32|mac: CONFIG += debug_and_release -QTDIR_build { - DESTDIR = $$QT_BUILD_TREE/lib - !wince*:DLLDESTDIR = $$QT_BUILD_TREE/bin -} +DESTDIR = $$QT_BUILD_TREE/lib +!wince*:DLLDESTDIR = $$QT_BUILD_TREE/bin +QT += designer # QtDesignerComponents uses DEFINES += QT_STATICPLUGIN @@ -17,7 +18,7 @@ isEmpty(QT_MAJOR_VERSION) { VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} } -include(../../../../../src/qt_targets.pri) +include($$QT_SOURCE_TREE/src/qt_targets.pri) QMAKE_TARGET_PRODUCT = Designer QMAKE_TARGET_DESCRIPTION = Graphical user interface designer. diff --git a/qttools/src/designer/src/designer/designer.pro b/qttools/src/designer/src/designer/designer.pro index 8564e96..42cd345 100644 --- a/qttools/src/designer/src/designer/designer.pro +++ b/qttools/src/designer/src/designer/designer.pro @@ -1,6 +1,7 @@ +load(qt_module) DESTDIR = ../../../../bin -QT += xml network +QT += xml network designer contains(QT_CONFIG, script): QT += script build_all:!build_pass { CONFIG -= build_all diff --git a/qttools/src/designer/src/lib/lib.pro b/qttools/src/designer/src/lib/lib.pro index 3ba6f52..4e0e2b2 100644 --- a/qttools/src/designer/src/lib/lib.pro +++ b/qttools/src/designer/src/lib/lib.pro @@ -1,11 +1,14 @@ +load(qt_module) + TEMPLATE=lib TARGET=QtDesigner QT += xml contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols CONFIG += qt win32|mac: CONFIG += debug_and_release -DESTDIR = ../../../../lib -!wince*:DLLDESTDIR = ../../../../bin +DESTDIR = $$QT_BUILD_TREE/lib +!wince*:DLLDESTDIR = $$QT_BUILD_TREE/bin +INCLUDEPATH += $$QT.designer.includes isEmpty(QT_MAJOR_VERSION) { VERSION=4.3.0 @@ -15,7 +18,7 @@ isEmpty(QT_MAJOR_VERSION) { unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtXml -include(../../../../src/qt_targets.pri) +include($$QT_SOURCE_TREE/src/qt_targets.pri) QMAKE_TARGET_PRODUCT = Designer QMAKE_TARGET_DESCRIPTION = Graphical user interface designer. diff --git a/qttools/src/designer/src/lib/shared/shared.pri b/qttools/src/designer/src/lib/shared/shared.pri index 9d50911..0d14517 100644 --- a/qttools/src/designer/src/lib/shared/shared.pri +++ b/qttools/src/designer/src/lib/shared/shared.pri @@ -4,7 +4,7 @@ contains(QT_CONFIG, script): QT += script include(../../../../shared/qtpropertybrowser/qtpropertybrowserutils.pri) include(../../../../shared/deviceskin/deviceskin.pri) -include(../../../../../src/tools/rcc/rcc.pri) +include($$QT_SOURCE_TREE/src/tools/rcc/rcc.pri) include(../../../../shared/findwidget/findwidget.pri) include(../../../../shared/qtgradienteditor/qtgradienteditor.pri) diff --git a/qttools/src/linguist/linguist/linguist.pro b/qttools/src/linguist/linguist/linguist.pro index ce8d585..ce78d13 100644 --- a/qttools/src/linguist/linguist/linguist.pro +++ b/qttools/src/linguist/linguist/linguist.pro @@ -1,8 +1,10 @@ +load(qt_modules) + TEMPLATE = app LANGUAGE = C++ DESTDIR = ../../../bin -QT += xml +QT += xml uitools designer CONFIG += qt \ warn_on \ @@ -17,6 +19,7 @@ build_all:!build_pass { include(../shared/formats.pri) DEFINES += QFORMINTERNAL_NAMESPACE + INCLUDEPATH += ../../designer/src/uitools INCLUDEPATH += ../../designer/src/lib/uilib diff --git a/qttools/src/linguist/lrelease/lrelease.pro b/qttools/src/linguist/lrelease/lrelease.pro index 89694be..8489431 100644 --- a/qttools/src/linguist/lrelease/lrelease.pro +++ b/qttools/src/linguist/lrelease/lrelease.pro @@ -1,3 +1,5 @@ +load(qt_module) + TEMPLATE = app TARGET = lrelease DESTDIR = ../../../bin @@ -12,10 +14,10 @@ SOURCES += \ win32:SOURCES += $$QT_SOURCE_TREE/src/corelib/io/qsettings_win.cpp macx:SOURCES += $$QT_SOURCE_TREE/src/corelib/io/qsettings_mac.cpp -include(../../../src/tools/bootstrap/bootstrap.pri) +include($$QT_SOURCE_TREE/src/tools/bootstrap/bootstrap.pri) include(../shared/formats.pri) include(../shared/proparser.pri) -include(../../shared/symbian/epocroot.pri) +include($$QT_SOURCE_TREE/tools/shared/symbian/epocroot.pri) win32:LIBS += -ladvapi32 # for qsettings_win.cpp diff --git a/qttools/src/linguist/lupdate/lupdate.pro b/qttools/src/linguist/lupdate/lupdate.pro index 3ed909a..5f1996e 100644 --- a/qttools/src/linguist/lupdate/lupdate.pro +++ b/qttools/src/linguist/lupdate/lupdate.pro @@ -1,3 +1,5 @@ +load(qt_module) + TEMPLATE = app TARGET = lupdate DESTDIR = ../../../bin @@ -15,8 +17,8 @@ build_all:!build_pass { include(../shared/formats.pri) include(../shared/proparser.pri) -include($$QT_SOURCE_TREE/src/declarative/qml/parser/parser.pri) -INCLUDEPATH += $$QT_SOURCE_TREE/src/declarative/qml $$QT_BUILD_TREE/include/QtDeclarative +include($$QT.declarative.sources/qml/parser/parser.pri) +INCLUDEPATH += $$QT.declarative.sources/qml $$QT.declarative.includes SOURCES += \ main.cpp \ diff --git a/qttools/src/qtconfig/qtconfig.pro b/qttools/src/qtconfig/qtconfig.pro index cb06e5a..bd758d9 100644 --- a/qttools/src/qtconfig/qtconfig.pro +++ b/qttools/src/qtconfig/qtconfig.pro @@ -1,3 +1,5 @@ +load(qt_module) + TEMPLATE = app CONFIG += qt warn_on x11 build_all:!build_pass { diff --git a/qttools/src/qttracereplay/qttracereplay.pro b/qttools/src/qttracereplay/qttracereplay.pro index cc5b98d..691a66b 100644 --- a/qttools/src/qttracereplay/qttracereplay.pro +++ b/qttools/src/qttracereplay/qttracereplay.pro @@ -1,9 +1,11 @@ +load(qt_module) + TEMPLATE = app DESTDIR = ../../bin DEPENDPATH += . -INCLUDEPATH += . ../../src/3rdparty/harfbuzz/src +INCLUDEPATH += . $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src TARGET = qttracereplay # Input diff --git a/qttools/src/src.pro b/qttools/src/src.pro index c6174e4..02e6a23 100644 --- a/qttools/src/src.pro +++ b/qttools/src/src.pro @@ -11,7 +11,6 @@ TEMPLATE = subdirs } else { SUBDIRS = assistant \ pixeltool \ - porting \ qtestlib \ qttracereplay contains(QT_EDITION, Console) { @@ -20,7 +19,7 @@ TEMPLATE = subdirs SUBDIRS += designer } } - unix:!symbian:!mac:!embedded:!qpa:SUBDIRS += qtconfig +# unix:!symbian:!mac:!embedded:!qpa:SUBDIRS += qtconfig win32:!wince*:SUBDIRS += activeqt } } diff --git a/qttools/sync.profile b/qttools/sync.profile index c6aaf0e..443b891 100644 --- a/qttools/sync.profile +++ b/qttools/sync.profile @@ -1,12 +1,25 @@ %modules = ( # path to module name map "QtHelp" => "$basedir/src/assistant/lib", + "QtDesigner" => "$basedir/src/designer/src/lib", + "QtUiTools" => "$basedir/src/designer/src/uitools", ); %moduleheaders = ( # restrict the module headers to those found in relative path ); %classnames = ( ); %mastercontent = ( + "sql" => "#include \n", + "xml" => "#include \n", + "network" => "#include \n", + "script" => "#include \n", + "qt3support" => "#include \n", + "declarative" => "#include \n", + "help" => "#include \n", + "designer" => "#include \n", + "uitools" => "#include \n", ); %modulepris = ( "QtHelp" => "$basedir/modules/qt_help.pri", + "QtDesigner" => "$basedir/modules/qt_designer.pri", + "QtUiTools" => "$basedir/modules/qt_uitools.pri", ); -- 1.7.3.2.343.g7d43d