diff options
| author | axis <[email protected]> | 2011-04-27 13:01:17 +0200 |
|---|---|---|
| committer | axis <[email protected]> | 2011-04-27 13:01:17 +0200 |
| commit | 1a0d5aeb9197ea0c3432903c402d8449bea9f6b4 (patch) | |
| tree | 3fbb60e2a0bff38c9cabfb1b5d347579e8769f93 /patches/0044-Move-uitools-from-QtTools-to-QtBase.patch | |
| parent | 2f66cb61ffbf147292092ebe29e3d4759dfb9bda (diff) | |
Diffstat (limited to 'patches/0044-Move-uitools-from-QtTools-to-QtBase.patch')
| -rw-r--r-- | patches/0044-Move-uitools-from-QtTools-to-QtBase.patch | 67 |
1 files changed, 46 insertions, 21 deletions
diff --git a/patches/0044-Move-uitools-from-QtTools-to-QtBase.patch b/patches/0044-Move-uitools-from-QtTools-to-QtBase.patch index 5be3315..0f03be2 100644 --- a/patches/0044-Move-uitools-from-QtTools-to-QtBase.patch +++ b/patches/0044-Move-uitools-from-QtTools-to-QtBase.patch @@ -1,11 +1,11 @@ -From 97a2728fc11062b0230b70cf09a9554eb96a560f Mon Sep 17 00:00:00 2001 +From 64daaa1cee9bcc7ca9766f8a4e305a882b867356 Mon Sep 17 00:00:00 2001 From: Liang Qi <[email protected]> Date: Wed, 12 Jan 2011 21:06:11 +0100 Subject: [PATCH] Move uitools from QtTools to QtBase --- qtbase/src/modules/qt_uilib.pri | 12 +++ - {qttools => qtbase/src}/modules/qt_uitools.pri | 4 +- + qtbase/src/modules/qt_uitools.pri | 15 +++ qtbase/src/src.pro | 5 +- qtbase/src/uitools/uitools.pro | 12 +- qtbase/sync.profile | 6 + @@ -17,6 +17,7 @@ Subject: [PATCH] Move uitools from QtTools to QtBase qtbase/tools/uilib/properties_p.h | 2 +- qtbase/tools/uilib/resourcebuilder_p.h | 2 +- qtbase/tools/uilib/textbuilder_p.h | 2 +- + qttools/modules/qt_uitools.pri | 15 --- qttools/src/designer/src/components/component.pri | 3 +- qttools/src/designer/src/components/lib/lib.pro | 2 +- qttools/src/designer/src/designer/designer.pro | 2 +- @@ -24,10 +25,11 @@ Subject: [PATCH] Move uitools from QtTools to QtBase qttools/src/designer/src/src.pro | 3 - qttools/src/linguist/linguist/linguist.pro | 6 +- qttools/sync.profile | 2 - - 20 files changed, 156 insertions(+), 29 deletions(-) + 21 files changed, 169 insertions(+), 42 deletions(-) create mode 100644 qtbase/src/modules/qt_uilib.pri - rename {qttools => qtbase/src}/modules/qt_uitools.pri (75%) + create mode 100644 qtbase/src/modules/qt_uitools.pri create mode 100644 qtbase/tools/uilib/extension.h + delete mode 100644 qttools/modules/qt_uitools.pri diff --git a/qtbase/src/modules/qt_uilib.pri b/qtbase/src/modules/qt_uilib.pri new file mode 100644 @@ -47,25 +49,27 @@ index 0000000..0e143de +QT.uilib.sources = $$QT_MODULE_BASE/tools/uilib +QT.uilib.libs = $$QT_MODULE_LIB_BASE +QT.uilib.depends = xml -diff --git a/qttools/modules/qt_uitools.pri b/qtbase/src/modules/qt_uitools.pri -similarity index 75% -rename from qttools/modules/qt_uitools.pri -rename to qtbase/src/modules/qt_uitools.pri -index c5160c5..1f4070c 100644 ---- a/qttools/modules/qt_uitools.pri +diff --git a/qtbase/src/modules/qt_uitools.pri b/qtbase/src/modules/qt_uitools.pri +new file mode 100644 +index 0000000..1f4070c +--- /dev/null +++ b/qtbase/src/modules/qt_uitools.pri -@@ -5,9 +5,9 @@ QT_UITOOLS_PATCH_VERSION = $$QT_PATCH_VERSION - - QT.uitools.name = QtUiTools - QT.uitools.bins = $$QT_MODULE_BIN_BASE --QT.uitools.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtUiTools +@@ -0,0 +1,15 @@ ++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.bins = $$QT_MODULE_BIN_BASE +QT.uitools.includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools - QT.uitools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools/private --QT.uitools.sources = $$QT_MODULE_BASE/src/designer/src/uitools ++QT.uitools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools/private +QT.uitools.sources = $$QT_MODULE_BASE/src/uitools - QT.uitools.libs = $$QT_MODULE_LIB_BASE - QT.uitools.depends = xml - QT.uitools.DEFINES = QT_UITOOLS_LIB ++QT.uitools.libs = $$QT_MODULE_LIB_BASE ++QT.uitools.depends = xml ++QT.uitools.DEFINES = QT_UITOOLS_LIB ++ ++QT_CONFIG += uitools diff --git a/qtbase/src/src.pro b/qtbase/src/src.pro index 7c51c25..491973c 100644 --- a/qtbase/src/src.pro @@ -367,6 +371,27 @@ index 8da296d..066733c 100644 #include <QtCore/QList> #include <QtCore/QString> +diff --git a/qttools/modules/qt_uitools.pri b/qttools/modules/qt_uitools.pri +deleted file mode 100644 +index c5160c5..0000000 +--- a/qttools/modules/qt_uitools.pri ++++ /dev/null +@@ -1,15 +0,0 @@ +-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.bins = $$QT_MODULE_BIN_BASE +-QT.uitools.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtUiTools +-QT.uitools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools/private +-QT.uitools.sources = $$QT_MODULE_BASE/src/designer/src/uitools +-QT.uitools.libs = $$QT_MODULE_LIB_BASE +-QT.uitools.depends = xml +-QT.uitools.DEFINES = QT_UITOOLS_LIB +- +-QT_CONFIG += uitools diff --git a/qttools/src/designer/src/components/component.pri b/qttools/src/designer/src/components/component.pri index c2fc10d..1dd8cf0 100644 --- a/qttools/src/designer/src/components/component.pri @@ -472,5 +497,5 @@ index 0e4a6c3..cfeac5e 100644 - "QtUiTools" => "$basedir/modules/qt_uitools.pri", ); -- -1.7.3.2.343.g7d43d +1.7.3.4 |