From 2aeefdddc12f1f969e28e732d3b1874caa918db9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lind?= Date: Fri, 10 Jun 2011 09:54:12 +0200 Subject: Remove the platforms/install_rules directory --- .../install_rules/fontengine_files/fontengine_files.pro | 9 --------- .../platforms/install_rules/freetype/freetype.pro | 11 ----------- .../platforms/install_rules/harfbuzz/harfbuzz.pro | 12 ------------ src/plugins/platforms/install_rules/install_rules.pro | 7 ------- src/plugins/platforms/platforms.pro | 17 ----------------- 5 files changed, 56 deletions(-) delete mode 100644 src/plugins/platforms/install_rules/fontengine_files/fontengine_files.pro delete mode 100644 src/plugins/platforms/install_rules/freetype/freetype.pro delete mode 100644 src/plugins/platforms/install_rules/harfbuzz/harfbuzz.pro delete mode 100644 src/plugins/platforms/install_rules/install_rules.pro (limited to 'src/plugins') diff --git a/src/plugins/platforms/install_rules/fontengine_files/fontengine_files.pro b/src/plugins/platforms/install_rules/fontengine_files/fontengine_files.pro deleted file mode 100644 index 2cd27da623..0000000000 --- a/src/plugins/platforms/install_rules/fontengine_files/fontengine_files.pro +++ /dev/null @@ -1,9 +0,0 @@ -TEMPLATE = subdirs - -FILES += \ - $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft_p.h \ - $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft.cpp - -sources.files = $$FILES -sources.path = $$[QT_INSTALL_DATA]/platforms/fontdatabases/fontengines -INSTALLS = sources diff --git a/src/plugins/platforms/install_rules/freetype/freetype.pro b/src/plugins/platforms/install_rules/freetype/freetype.pro deleted file mode 100644 index d9eb6ff304..0000000000 --- a/src/plugins/platforms/install_rules/freetype/freetype.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = subdirs - -SRCDIR += \ - $$QT_SOURCE_TREE/src/3rdparty/freetype/src - -INCDIR += \ - $$QT_SOURCE_TREE/src/3rdparty/freetype/include - -sources.files = $$SRCDIR $$INCDIR -sources.path = $$[QT_INSTALL_DATA]/platforms/fontdatabases/freetype -INSTALLS = sources diff --git a/src/plugins/platforms/install_rules/harfbuzz/harfbuzz.pro b/src/plugins/platforms/install_rules/harfbuzz/harfbuzz.pro deleted file mode 100644 index c0dba4a074..0000000000 --- a/src/plugins/platforms/install_rules/harfbuzz/harfbuzz.pro +++ /dev/null @@ -1,12 +0,0 @@ -#This file makes sure that harbuzz gets installed, -#so that plugins can be compiled out of source -TEMPLATE = subdirs - - -SRCDIR += \ - $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src - -sources.files = $$SRCDIR -sources.path = $$[QT_INSTALL_DATA]/platforms/fontdatabases/harfbuzz -INSTALLS = sources - diff --git a/src/plugins/platforms/install_rules/install_rules.pro b/src/plugins/platforms/install_rules/install_rules.pro deleted file mode 100644 index 8b64f8a415..0000000000 --- a/src/plugins/platforms/install_rules/install_rules.pro +++ /dev/null @@ -1,7 +0,0 @@ -# This is so that additional sources are installed -# in the QT_INSTALL_DATA directory -TEMPLATE = subdirs - -SUBDIRS += harfbuzz -SUBDIRS += freetype -SUBDIRS += fontengine_files diff --git a/src/plugins/platforms/platforms.pro b/src/plugins/platforms/platforms.pro index 681220d4d3..9d7ae296a9 100644 --- a/src/plugins/platforms/platforms.pro +++ b/src/plugins/platforms/platforms.pro @@ -1,22 +1,5 @@ TEMPLATE = subdirs -#out of source tree plugin setup start -SUBDIRS += install_rules -SRCDIRS = \ - dnd \ - eglconvenience \ - fb_base \ - fontdatabases \ - glxconvenience \ - printersupport \ - wayland - -srcdirs.files = $$SRCDIRS -srcdirs.path = $$[QT_INSTALL_DATA]/platforms - -INSTALLS = srcdirs -#out of source tree plugin setup end - SUBDIRS += minimal contains(QT_CONFIG, wayland) { -- cgit v1.2.3