From 5b8565ec05dda9a3c7401a5e7247defe3bcc89a6 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@nokia.com>
Date: Thu, 23 Jun 2011 14:48:03 +0200
Subject: [PATCH] Desktop components are now installable
---
components/components.pro | 59 +++++++++++++-
components/styleitem/styleitem.pro | 78 -------------------
desktop.pro | 2 +-
src/src.pro | 2 +
.../styleitem/qdeclarativefolderlistmodel.cpp | 0
.../styleitem/qdeclarativefolderlistmodel.h | 0
{components => src}/styleitem/qrangemodel.cpp | 0
{components => src}/styleitem/qrangemodel.h | 0
{components => src}/styleitem/qrangemodel_p.h | 0
{components => src}/styleitem/qstyleitem.cpp | 0
{components => src}/styleitem/qstyleitem.h | 0
.../styleitem/qstyleplugin.cpp | 0
{components => src}/styleitem/qstyleplugin.h | 0
{components => src}/styleitem/qtmenu.cpp | 0
{components => src}/styleitem/qtmenu.h | 0
{components => src}/styleitem/qtmenubar.cpp | 0
{components => src}/styleitem/qtmenubar.h | 0
{components => src}/styleitem/qtmenuitem.cpp | 0
{components => src}/styleitem/qtmenuitem.h | 0
{components => src}/styleitem/qwheelarea.cpp | 0
{components => src}/styleitem/qwheelarea.h | 0
src/styleitem/styleitem.pro | 45 +++++++++++
22 files changed, 105 insertions(+), 81 deletions(-)
delete mode 100644 components/styleitem/styleitem.pro
create mode 100644 src/src.pro
rename {components => src}/styleitem/qdeclarativefolderlistmodel.cpp (100%)
rename {components => src}/styleitem/qdeclarativefolderlistmodel.h (100%)
rename {components => src}/styleitem/qrangemodel.cpp (100%)
rename {components => src}/styleitem/qrangemodel.h (100%)
rename {components => src}/styleitem/qrangemodel_p.h (100%)
rename {components => src}/styleitem/qstyleitem.cpp (100%)
rename {components => src}/styleitem/qstyleitem.h (100%)
rename {components => src}/styleitem/qstyleplugin.cpp (100%)
rename {components => src}/styleitem/qstyleplugin.h (100%)
rename {components => src}/styleitem/qtmenu.cpp (100%)
rename {components => src}/styleitem/qtmenu.h (100%)
rename {components => src}/styleitem/qtmenubar.cpp (100%)
rename {components => src}/styleitem/qtmenubar.h (100%)
rename {components => src}/styleitem/qtmenuitem.cpp (100%)
rename {components => src}/styleitem/qtmenuitem.h (100%)
rename {components => src}/styleitem/qwheelarea.cpp (100%)
rename {components => src}/styleitem/qwheelarea.h (100%)
create mode 100644 src/styleitem/styleitem.pro
diff --git a/components/components.pro b/components/components.pro
index 83e0a3d4c..00c562eaa 100644
--- a/components/components.pro
+++ b/components/components.pro
@@ -1,2 +1,57 @@
-TEMPLATE = subdirs
-SUBDIRS = styleitem
+TEMPLATE = subdirs # XXX: Avoid call the linker
+TARGETPATH = QtDesktop
+
+symbian {
+ INSTALL_IMPORTS = /resource/qt/imports
+} else {
+ INSTALL_IMPORTS = $$[QT_INSTALL_IMPORTS]
+}
+
+QML_FILES = \
+ qmldir \
+ Button.qml \
+ ComboBox.qml \
+ Dial.qml \
+ ProgressBar.qml \
+ ScrollBar.qml \
+ Switch.qml \
+ TableView.qml \
+ ToolBar.qml \
+ ButtonRow.qml \
+ Frame.qml \
+ MenuItem.qml \
+ Slider.qml \
+ TabBar.qml \
+ Tab.qml \
+ ToolButton.qml \
+ CheckBox.qml \
+ ContextMenu.qml \
+ GroupBox.qml \
+ Menu.qml \
+ RadioButton.qml \
+ SpinBox.qml \
+ TabFrame.qml \
+ TextArea.qml \
+ ChoiceList.qml \
+ ScrollArea.qml \
+ SplitterRow.qml \
+ TableColumn.qml \
+ TextField.qml
+
+QML_DIRS = \
+ custom \
+ images
+
+qmlfiles.files = $$QML_FILES
+qmlfiles.sources = $$QML_FILES
+qmlfiles.path = $$INSTALL_IMPORTS/$$TARGETPATH
+
+qmldirs.files = $$QML_DIRS
+qmldirs.sources = $$QML_DIRS
+qmldirs.path = $$INSTALL_IMPORTS/$$TARGETPATH
+
+INSTALLS += qmlfiles qmldirs
+
+symbian {
+ DEPLOYMENT += qmlfiles qmldirs
+}
\ No newline at end of file
diff --git a/components/styleitem/styleitem.pro b/components/styleitem/styleitem.pro
deleted file mode 100644
index 41a9689c0..000000000
--- a/components/styleitem/styleitem.pro
+++ /dev/null
@@ -1,78 +0,0 @@
-TEMPLATE = lib
-CONFIG += qt plugin
-QT += declarative
-QT += script
-
-TARGET = styleplugin
-
-DESTDIR = ..\\plugin
-OBJECTS_DIR = tmp
-MOC_DIR = tmp
-
-HEADERS += qtmenu.h \
- qtmenubar.h \
- qtmenuitem.h \
- qrangemodel_p.h \
- qrangemodel.h \
- qstyleplugin.h \
- qdeclarativefolderlistmodel.h \
- qstyleitem.h \
- qwheelarea.h
-
-SOURCES += qtmenu.cpp \
- qtmenubar.cpp \
- qtmenuitem.cpp \
- qrangemodel.cpp \
- qstyleplugin.cpp \
- qdeclarativefolderlistmodel.cpp \
- qstyleitem.cpp \
- qwheelarea.cpp
-
-
-OTHER_FILES += \
- ../gallery.qml \
- ../widgets/Tab.qml \
- ../widgets/TabBar.qml \
- ../widgets/TabFrame.qml \
- ../Button.qml \
- ../ButtonRow.qml \
- ../CheckBox.qml \
- ../ChoiceList.qml \
- ../components.pro \
- ../ContextMenu.qml \
- ../Dial.qml \
- ../Frame.qml \
- ../GroupBox.qml \
- ../Menu.qml \
- ../ProgressBar.qml \
- ../RadioButton.qml \
- ../ScrollArea.qml \
- ../ScrollBar.qml \
- ../Slider.qml \
- ../SpinBox.qml \
- ../Switch.qml \
- ../Tab.qml \
- ../TableView.qml \
- ../TabBar.qml \
- ../TabFrame.qml \
- ../TextArea.qml \
- ../TextField.qml \
- ../TextScrollArea.qml \
- ../ToolBar.qml \
- ../ToolButton.qml \
- ../custom/BasicButton.qml \
- ../custom/BusyIndicator.qml \
- ../custom/Button.qml \
- ../custom/ButtonColumn.qml \
- ../custom/ButtonGroup.js \
- ../custom/ButtonRow.qml \
- ../custom/CheckBox.qml \
- ../custom/ChoiceList.qml \
- ../custom/ProgressBar.qml \
- ../custom/Slider.qml \
- ../custom/SpinBox.qml \
- ../custom/TextField.qml \
- ../../examples/Browser.qml \
- ../../examples/Panel.qml \
- ../../examples/ModelView.qml \
- ../../examples/Gallery.qml
diff --git a/desktop.pro b/desktop.pro
index e4fc550a2..d7cfec9c1 100644
--- a/desktop.pro
+++ b/desktop.pro
@@ -1,2 +1,2 @@
TEMPLATE = subdirs
-SUBDIRS = components
+SUBDIRS = components src
diff --git a/src/src.pro b/src/src.pro
new file mode 100644
index 000000000..b06387a2b
--- /dev/null
+++ b/src/src.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+SUBDIRS = styleitem
diff --git a/components/styleitem/qdeclarativefolderlistmodel.cpp b/src/styleitem/qdeclarativefolderlistmodel.cpp
similarity index 100%
rename from components/styleitem/qdeclarativefolderlistmodel.cpp
rename to src/styleitem/qdeclarativefolderlistmodel.cpp
diff --git a/components/styleitem/qdeclarativefolderlistmodel.h b/src/styleitem/qdeclarativefolderlistmodel.h
similarity index 100%
rename from components/styleitem/qdeclarativefolderlistmodel.h
rename to src/styleitem/qdeclarativefolderlistmodel.h
diff --git a/components/styleitem/qrangemodel.cpp b/src/styleitem/qrangemodel.cpp
similarity index 100%
rename from components/styleitem/qrangemodel.cpp
rename to src/styleitem/qrangemodel.cpp
diff --git a/components/styleitem/qrangemodel.h b/src/styleitem/qrangemodel.h
similarity index 100%
rename from components/styleitem/qrangemodel.h
rename to src/styleitem/qrangemodel.h
diff --git a/components/styleitem/qrangemodel_p.h b/src/styleitem/qrangemodel_p.h
similarity index 100%
rename from components/styleitem/qrangemodel_p.h
rename to src/styleitem/qrangemodel_p.h
diff --git a/components/styleitem/qstyleitem.cpp b/src/styleitem/qstyleitem.cpp
similarity index 100%
rename from components/styleitem/qstyleitem.cpp
rename to src/styleitem/qstyleitem.cpp
diff --git a/components/styleitem/qstyleitem.h b/src/styleitem/qstyleitem.h
similarity index 100%
rename from components/styleitem/qstyleitem.h
rename to src/styleitem/qstyleitem.h
diff --git a/components/styleitem/qstyleplugin.cpp b/src/styleitem/qstyleplugin.cpp
similarity index 100%
rename from components/styleitem/qstyleplugin.cpp
rename to src/styleitem/qstyleplugin.cpp
diff --git a/components/styleitem/qstyleplugin.h b/src/styleitem/qstyleplugin.h
similarity index 100%
rename from components/styleitem/qstyleplugin.h
rename to src/styleitem/qstyleplugin.h
diff --git a/components/styleitem/qtmenu.cpp b/src/styleitem/qtmenu.cpp
similarity index 100%
rename from components/styleitem/qtmenu.cpp
rename to src/styleitem/qtmenu.cpp
diff --git a/components/styleitem/qtmenu.h b/src/styleitem/qtmenu.h
similarity index 100%
rename from components/styleitem/qtmenu.h
rename to src/styleitem/qtmenu.h
diff --git a/components/styleitem/qtmenubar.cpp b/src/styleitem/qtmenubar.cpp
similarity index 100%
rename from components/styleitem/qtmenubar.cpp
rename to src/styleitem/qtmenubar.cpp
diff --git a/components/styleitem/qtmenubar.h b/src/styleitem/qtmenubar.h
similarity index 100%
rename from components/styleitem/qtmenubar.h
rename to src/styleitem/qtmenubar.h
diff --git a/components/styleitem/qtmenuitem.cpp b/src/styleitem/qtmenuitem.cpp
similarity index 100%
rename from components/styleitem/qtmenuitem.cpp
rename to src/styleitem/qtmenuitem.cpp
diff --git a/components/styleitem/qtmenuitem.h b/src/styleitem/qtmenuitem.h
similarity index 100%
rename from components/styleitem/qtmenuitem.h
rename to src/styleitem/qtmenuitem.h
diff --git a/components/styleitem/qwheelarea.cpp b/src/styleitem/qwheelarea.cpp
similarity index 100%
rename from components/styleitem/qwheelarea.cpp
rename to src/styleitem/qwheelarea.cpp
diff --git a/components/styleitem/qwheelarea.h b/src/styleitem/qwheelarea.h
similarity index 100%
rename from components/styleitem/qwheelarea.h
rename to src/styleitem/qwheelarea.h
diff --git a/src/styleitem/styleitem.pro b/src/styleitem/styleitem.pro
new file mode 100644
index 000000000..a05848e9a
--- /dev/null
+++ b/src/styleitem/styleitem.pro
@@ -0,0 +1,45 @@
+TEMPLATE = lib
+CONFIG += qt plugin
+QT += declarative
+QT += script
+
+TARGET = styleplugin
+
+DESTDIR = ../../components/plugin
+OBJECTS_DIR = obj
+MOC_DIR = moc
+
+HEADERS += qtmenu.h \
+ qtmenubar.h \
+ qtmenuitem.h \
+ qrangemodel_p.h \
+ qrangemodel.h \
+ qstyleplugin.h \
+ qdeclarativefolderlistmodel.h \
+ qstyleitem.h \
+ qwheelarea.h
+
+SOURCES += qtmenu.cpp \
+ qtmenubar.cpp \
+ qtmenuitem.cpp \
+ qrangemodel.cpp \
+ qstyleplugin.cpp \
+ qdeclarativefolderlistmodel.cpp \
+ qstyleitem.cpp \
+ qwheelarea.cpp
+
+TARGETPATH = QtDesktop/plugin
+
+symbian {
+ INSTALL_IMPORTS = /resource/qt/imports
+} else {
+ INSTALL_IMPORTS = $$[QT_INSTALL_IMPORTS]
+}
+
+target.path = $$INSTALL_IMPORTS/$$TARGETPATH
+
+INSTALLS += target
+
+symbian {
+ DEPLOYMENT += target
+}
\ No newline at end of file
--
GitLab