summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-04-12 10:49:30 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-26 14:56:01 +0200
commit846dfb4eebe106ab67ffbd2f4b166d02e168b828 (patch)
tree5d2600c68db6111e5487f9641e28116c890600c0
parentb6beef13c5c34818dc5715dc3353a331d935ae0f (diff)
auto-generate module pris
Change-Id: I008b9ade01b3f043d8e0cdc6653104a4e9d578b2 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
-rw-r--r--modules/qt_feedback.pri17
-rw-r--r--src/feedback/feedback.pro3
-rw-r--r--sync.profile3
3 files changed, 1 insertions, 22 deletions
diff --git a/modules/qt_feedback.pri b/modules/qt_feedback.pri
deleted file mode 100644
index 5e73436..0000000
--- a/modules/qt_feedback.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-QT.feedback.VERSION = 5.0.0
-QT.feedback.MAJOR_VERSION = 5
-QT.feedback.MINOR_VERSION = 0
-QT.feedback.PATCH_VERSION = 0
-
-QT.feedback.name = QtFeedback
-QT.feedback.bins = $$QT_MODULE_BIN_BASE
-QT.feedback.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtFeedback
-QT.feedback.private_includes = $$QT_MODULE_INCLUDE_BASE/QtFeedback/$$QT.feedback.VERSION
-QT.feedback.sources = $$QT_MODULE_BASE/src/feedback
-QT.feedback.libs = $$QT_MODULE_LIB_BASE
-QT.feedback.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.feedback.imports = $$QT_MODULE_IMPORT_BASE
-QT.feedback.depends = core
-QT.feedback.DEFINES = QT_FEEDBACK_LIB
-
-QT_CONFIG += feedback
diff --git a/src/feedback/feedback.pro b/src/feedback/feedback.pro
index b714b69..a0235a8 100644
--- a/src/feedback/feedback.pro
+++ b/src/feedback/feedback.pro
@@ -4,9 +4,8 @@ TARGET = QtFeedback
QPRO_PWD = $PWD
CONFIG += module
-MODULE_PRI = ../../modules/qt_feedback.pri
-QT = core gui network
+QT = core
DEFINES += QT_BUILD_FEEDBACK_LIB QT_MAKEDLL
diff --git a/sync.profile b/sync.profile
index fb3e9e3..240ebd5 100644
--- a/sync.profile
+++ b/sync.profile
@@ -9,9 +9,6 @@
%mastercontent = (
"feedback" => "#include <QtFeedback/QtFeedback>\n",
);
-%modulepris = (
- "QtFeedback" => "$basedir/modules/qt_feedback.pri",
-);
# Module dependencies.
# Every module that is required to build this module should have one entry.
# Each of the module version specifiers can take one of the following values: