Make Components installable. Fix Shadow Build.

Task-Number: QTCREATORBUG-5672
Done-with: Oswald Buddenhagen
Change-Id: I61f8a83205bc338ba12e43b7471eaa957da2b004
Reviewed-on: http://codereview.qt.nokia.com/2451
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

86 files changed, 117 insertions, 125 deletions

diff --git a/share/qtcreator/welcomescreen/components/Button.qml b/lib/qtcreator/qtcomponents/Button.qml
index d7a3490f59..d7a3490f59 100644
--- a/share/qtcreator/welcomescreen/components/Button.qml
+++ b/lib/qtcreator/qtcomponents/Button.qml
diff --git a/share/qtcreator/welcomescreen/components/ButtonRow.qml b/lib/qtcreator/qtcomponents/ButtonRow.qml
index b2cba92849..b2cba92849 100644
--- a/share/qtcreator/welcomescreen/components/ButtonRow.qml
+++ b/lib/qtcreator/qtcomponents/ButtonRow.qml
diff --git a/share/qtcreator/welcomescreen/components/CheckBox.qml b/lib/qtcreator/qtcomponents/CheckBox.qml
index b8b94ca77f..b8b94ca77f 100644
--- a/share/qtcreator/welcomescreen/components/CheckBox.qml
+++ b/lib/qtcreator/qtcomponents/CheckBox.qml
diff --git a/share/qtcreator/welcomescreen/components/ChoiceList.qml b/lib/qtcreator/qtcomponents/ChoiceList.qml
index cf72493421..cf72493421 100644
--- a/share/qtcreator/welcomescreen/components/ChoiceList.qml
+++ b/lib/qtcreator/qtcomponents/ChoiceList.qml
diff --git a/share/qtcreator/welcomescreen/components/ContextMenu.qml b/lib/qtcreator/qtcomponents/ContextMenu.qml
index 9592a2068c..9592a2068c 100644
--- a/share/qtcreator/welcomescreen/components/ContextMenu.qml
+++ b/lib/qtcreator/qtcomponents/ContextMenu.qml
diff --git a/share/qtcreator/welcomescreen/components/Dial.qml b/lib/qtcreator/qtcomponents/Dial.qml
index 9793b46be1..9793b46be1 100644
--- a/share/qtcreator/welcomescreen/components/Dial.qml
+++ b/lib/qtcreator/qtcomponents/Dial.qml
diff --git a/share/qtcreator/welcomescreen/components/Frame.qml b/lib/qtcreator/qtcomponents/Frame.qml
index f101cb6b01..f101cb6b01 100644
--- a/share/qtcreator/welcomescreen/components/Frame.qml
+++ b/lib/qtcreator/qtcomponents/Frame.qml
diff --git a/share/qtcreator/welcomescreen/components/GroupBox.qml b/lib/qtcreator/qtcomponents/GroupBox.qml
index b9de3ad662..b9de3ad662 100644
--- a/share/qtcreator/welcomescreen/components/GroupBox.qml
+++ b/lib/qtcreator/qtcomponents/GroupBox.qml
diff --git a/share/qtcreator/welcomescreen/components/Menu.qml b/lib/qtcreator/qtcomponents/Menu.qml
index 8db25dbcae..8db25dbcae 100644
--- a/share/qtcreator/welcomescreen/components/Menu.qml
+++ b/lib/qtcreator/qtcomponents/Menu.qml
diff --git a/share/qtcreator/welcomescreen/components/MenuItem.qml b/lib/qtcreator/qtcomponents/MenuItem.qml
index d02b3500a6..d02b3500a6 100644
--- a/share/qtcreator/welcomescreen/components/MenuItem.qml
+++ b/lib/qtcreator/qtcomponents/MenuItem.qml
diff --git a/share/qtcreator/welcomescreen/components/ProgressBar.qml b/lib/qtcreator/qtcomponents/ProgressBar.qml
index 358993554d..358993554d 100644
--- a/share/qtcreator/welcomescreen/components/ProgressBar.qml
+++ b/lib/qtcreator/qtcomponents/ProgressBar.qml
diff --git a/share/qtcreator/welcomescreen/components/RadioButton.qml b/lib/qtcreator/qtcomponents/RadioButton.qml
index 9045158fb6..9045158fb6 100644
--- a/share/qtcreator/welcomescreen/components/RadioButton.qml
+++ b/lib/qtcreator/qtcomponents/RadioButton.qml
diff --git a/share/qtcreator/welcomescreen/components/ScrollArea.qml b/lib/qtcreator/qtcomponents/ScrollArea.qml
index 497239e28a..497239e28a 100644
--- a/share/qtcreator/welcomescreen/components/ScrollArea.qml
+++ b/lib/qtcreator/qtcomponents/ScrollArea.qml
diff --git a/share/qtcreator/welcomescreen/components/ScrollBar.qml b/lib/qtcreator/qtcomponents/ScrollBar.qml
index 18ed13bd54..18ed13bd54 100644
--- a/share/qtcreator/welcomescreen/components/ScrollBar.qml
+++ b/lib/qtcreator/qtcomponents/ScrollBar.qml
diff --git a/share/qtcreator/welcomescreen/components/Slider.qml b/lib/qtcreator/qtcomponents/Slider.qml
index ca2c5a49fe..ca2c5a49fe 100644
--- a/share/qtcreator/welcomescreen/components/Slider.qml
+++ b/lib/qtcreator/qtcomponents/Slider.qml
diff --git a/share/qtcreator/welcomescreen/components/SpinBox.qml b/lib/qtcreator/qtcomponents/SpinBox.qml
index a929adfa72..a929adfa72 100644
--- a/share/qtcreator/welcomescreen/components/SpinBox.qml
+++ b/lib/qtcreator/qtcomponents/SpinBox.qml
diff --git a/share/qtcreator/welcomescreen/components/SplitterRow.qml b/lib/qtcreator/qtcomponents/SplitterRow.qml
index ced970e27f..ced970e27f 100644
--- a/share/qtcreator/welcomescreen/components/SplitterRow.qml
+++ b/lib/qtcreator/qtcomponents/SplitterRow.qml
diff --git a/share/qtcreator/welcomescreen/components/Switch.qml b/lib/qtcreator/qtcomponents/Switch.qml
index fcc54094c1..fcc54094c1 100644
--- a/share/qtcreator/welcomescreen/components/Switch.qml
+++ b/lib/qtcreator/qtcomponents/Switch.qml
diff --git a/share/qtcreator/welcomescreen/components/Tab.qml b/lib/qtcreator/qtcomponents/Tab.qml
index 520f07db75..520f07db75 100644
--- a/share/qtcreator/welcomescreen/components/Tab.qml
+++ b/lib/qtcreator/qtcomponents/Tab.qml
diff --git a/share/qtcreator/welcomescreen/components/TabBar.qml b/lib/qtcreator/qtcomponents/TabBar.qml
index 27d648f0b1..27d648f0b1 100644
--- a/share/qtcreator/welcomescreen/components/TabBar.qml
+++ b/lib/qtcreator/qtcomponents/TabBar.qml
diff --git a/share/qtcreator/welcomescreen/components/TabFrame.qml b/lib/qtcreator/qtcomponents/TabFrame.qml
index d9e730dade..d9e730dade 100644
--- a/share/qtcreator/welcomescreen/components/TabFrame.qml
+++ b/lib/qtcreator/qtcomponents/TabFrame.qml
diff --git a/share/qtcreator/welcomescreen/components/TableColumn.qml b/lib/qtcreator/qtcomponents/TableColumn.qml
index 9081f6af13..9081f6af13 100644
--- a/share/qtcreator/welcomescreen/components/TableColumn.qml
+++ b/lib/qtcreator/qtcomponents/TableColumn.qml
diff --git a/share/qtcreator/welcomescreen/components/TableView.qml b/lib/qtcreator/qtcomponents/TableView.qml
index 132610c3f6..132610c3f6 100644
--- a/share/qtcreator/welcomescreen/components/TableView.qml
+++ b/lib/qtcreator/qtcomponents/TableView.qml
diff --git a/share/qtcreator/welcomescreen/components/TextArea.qml b/lib/qtcreator/qtcomponents/TextArea.qml
index c222e9ecc3..c222e9ecc3 100644
--- a/share/qtcreator/welcomescreen/components/TextArea.qml
+++ b/lib/qtcreator/qtcomponents/TextArea.qml
diff --git a/share/qtcreator/welcomescreen/components/TextField.qml b/lib/qtcreator/qtcomponents/TextField.qml
index c9ce0959f1..c9ce0959f1 100644
--- a/share/qtcreator/welcomescreen/components/TextField.qml
+++ b/lib/qtcreator/qtcomponents/TextField.qml
diff --git a/share/qtcreator/welcomescreen/components/ToolBar.qml b/lib/qtcreator/qtcomponents/ToolBar.qml
index a33fd69e3b..a33fd69e3b 100644
--- a/share/qtcreator/welcomescreen/components/ToolBar.qml
+++ b/lib/qtcreator/qtcomponents/ToolBar.qml
diff --git a/share/qtcreator/welcomescreen/components/ToolButton.qml b/lib/qtcreator/qtcomponents/ToolButton.qml
index 2747947d5d..2747947d5d 100644
--- a/share/qtcreator/welcomescreen/components/ToolButton.qml
+++ b/lib/qtcreator/qtcomponents/ToolButton.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/BasicButton.qml b/lib/qtcreator/qtcomponents/custom/BasicButton.qml
index 79ceb40b51..79ceb40b51 100644
--- a/share/qtcreator/welcomescreen/components/custom/BasicButton.qml
+++ b/lib/qtcreator/qtcomponents/custom/BasicButton.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/Button.qml b/lib/qtcreator/qtcomponents/custom/Button.qml
index f3a4af3adf..f3a4af3adf 100644
--- a/share/qtcreator/welcomescreen/components/custom/Button.qml
+++ b/lib/qtcreator/qtcomponents/custom/Button.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/ButtonColumn.qml b/lib/qtcreator/qtcomponents/custom/ButtonColumn.qml
index 4a1fe634eb..4a1fe634eb 100644
--- a/share/qtcreator/welcomescreen/components/custom/ButtonColumn.qml
+++ b/lib/qtcreator/qtcomponents/custom/ButtonColumn.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/ButtonGroup.js b/lib/qtcreator/qtcomponents/custom/ButtonGroup.js
index 19d05fee33..19d05fee33 100644
--- a/share/qtcreator/welcomescreen/components/custom/ButtonGroup.js
+++ b/lib/qtcreator/qtcomponents/custom/ButtonGroup.js
diff --git a/share/qtcreator/welcomescreen/components/custom/ButtonRow.qml b/lib/qtcreator/qtcomponents/custom/ButtonRow.qml
index 1f1ceeb5b2..1f1ceeb5b2 100644
--- a/share/qtcreator/welcomescreen/components/custom/ButtonRow.qml
+++ b/lib/qtcreator/qtcomponents/custom/ButtonRow.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/CheckBox.qml b/lib/qtcreator/qtcomponents/custom/CheckBox.qml
index 851b032dcc..851b032dcc 100644
--- a/share/qtcreator/welcomescreen/components/custom/CheckBox.qml
+++ b/lib/qtcreator/qtcomponents/custom/CheckBox.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/ChoiceList.qml b/lib/qtcreator/qtcomponents/custom/ChoiceList.qml
index 4da78ffa7d..4da78ffa7d 100644
--- a/share/qtcreator/welcomescreen/components/custom/ChoiceList.qml
+++ b/lib/qtcreator/qtcomponents/custom/ChoiceList.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/GroupBox.qml b/lib/qtcreator/qtcomponents/custom/GroupBox.qml
index 87b471074c..87b471074c 100644
--- a/share/qtcreator/welcomescreen/components/custom/GroupBox.qml
+++ b/lib/qtcreator/qtcomponents/custom/GroupBox.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/ProgressBar.qml b/lib/qtcreator/qtcomponents/custom/ProgressBar.qml
index 995d477fda..995d477fda 100644
--- a/share/qtcreator/welcomescreen/components/custom/ProgressBar.qml
+++ b/lib/qtcreator/qtcomponents/custom/ProgressBar.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/Slider.qml b/lib/qtcreator/qtcomponents/custom/Slider.qml
index 3e20b5582d..3e20b5582d 100644
--- a/share/qtcreator/welcomescreen/components/custom/Slider.qml
+++ b/lib/qtcreator/qtcomponents/custom/Slider.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/SpinBox.qml b/lib/qtcreator/qtcomponents/custom/SpinBox.qml
index e17b56c931..e17b56c931 100644
--- a/share/qtcreator/welcomescreen/components/custom/SpinBox.qml
+++ b/lib/qtcreator/qtcomponents/custom/SpinBox.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/SplitterRow.qml b/lib/qtcreator/qtcomponents/custom/SplitterRow.qml
index 7c70931159..7c70931159 100644
--- a/share/qtcreator/welcomescreen/components/custom/SplitterRow.qml
+++ b/lib/qtcreator/qtcomponents/custom/SplitterRow.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/TextField.qml b/lib/qtcreator/qtcomponents/custom/TextField.qml
index 4790e54f4e..4790e54f4e 100644
--- a/share/qtcreator/welcomescreen/components/custom/TextField.qml
+++ b/lib/qtcreator/qtcomponents/custom/TextField.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/behaviors/ButtonBehavior.qml b/lib/qtcreator/qtcomponents/custom/behaviors/ButtonBehavior.qml
index da8c49149b..da8c49149b 100644
--- a/share/qtcreator/welcomescreen/components/custom/behaviors/ButtonBehavior.qml
+++ b/lib/qtcreator/qtcomponents/custom/behaviors/ButtonBehavior.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/behaviors/ModalPopupBehavior.qml b/lib/qtcreator/qtcomponents/custom/behaviors/ModalPopupBehavior.qml
index 0e5da2c311..0e5da2c311 100644
--- a/share/qtcreator/welcomescreen/components/custom/behaviors/ModalPopupBehavior.qml
+++ b/lib/qtcreator/qtcomponents/custom/behaviors/ModalPopupBehavior.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/components.pro b/lib/qtcreator/qtcomponents/custom/components.pro
index be0663d709..be0663d709 100644
--- a/share/qtcreator/welcomescreen/components/custom/components.pro
+++ b/lib/qtcreator/qtcomponents/custom/components.pro
diff --git a/share/qtcreator/welcomescreen/components/custom/private/ChoiceListPopup.qml b/lib/qtcreator/qtcomponents/custom/private/ChoiceListPopup.qml
index 5445fdc165..5445fdc165 100644
--- a/share/qtcreator/welcomescreen/components/custom/private/ChoiceListPopup.qml
+++ b/lib/qtcreator/qtcomponents/custom/private/ChoiceListPopup.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/qmldir b/lib/qtcreator/qtcomponents/custom/qmldir
index 8da1fd80f0..8da1fd80f0 100644
--- a/share/qtcreator/welcomescreen/components/custom/qmldir
+++ b/lib/qtcreator/qtcomponents/custom/qmldir
diff --git a/share/qtcreator/welcomescreen/components/images/folder_new.png b/lib/qtcreator/qtcomponents/images/folder_new.png
index 8d8bb9bd76..8d8bb9bd76 100644
--- a/share/qtcreator/welcomescreen/components/images/folder_new.png
+++ b/lib/qtcreator/qtcomponents/images/folder_new.png
diff --git a/share/qtcreator/welcomescreen/components/qmldir b/lib/qtcreator/qtcomponents/qmldir
index d33a7971d7..d33a7971d7 100644
--- a/share/qtcreator/welcomescreen/components/qmldir
+++ b/lib/qtcreator/qtcomponents/qmldir
diff --git a/lib/qtcreator/qtcomponents/qtcomponents.pro b/lib/qtcreator/qtcomponents/qtcomponents.pro
new file mode 100644
index 0000000000..9a3dc0e67f
--- /dev/null
+++ b/lib/qtcreator/qtcomponents/qtcomponents.pro
@@ -0,0 +1,57 @@
+include(../../../qtcreator.pri)
+
+TEMPLATE = app
+TARGET = phony_target3
+CONFIG -= qt separate_debug_info gdb_dwarf_index
+QT =
+LIBS =
+macx:CONFIG -= app_bundle
+
+isEmpty(vcproj) {
+    QMAKE_LINK = @: IGNORE THIS LINE
+    OBJECTS_DIR =
+    win32:CONFIG -= embed_manifest_exe
+} else {
+    CONFIG += console
+    PHONY_DEPS = .
+    phony_src.input = PHONY_DEPS
+    phony_src.output = phony.c
+    phony_src.variable_out = GENERATED_SOURCES
+    phony_src.commands = echo int main() { return 0; } > phony.c
+    phony_src.name = CREATE phony.c
+    phony_src.CONFIG += combine
+    QMAKE_EXTRA_COMPILERS += phony_src
+}
+
+DATA_FILE_PATTERNS = \
+    $$PWD/*.qml \
+    $$PWD/qmldir \
+    $$PWD/images/* \
+    $$PWD/custom/* \
+    $$PWD/custom/behaviors/* \
+    $$PWD/custom/private/*
+
+!isEmpty(copydata) {
+
+    for(data_file, DATA_FILE_PATTERNS) {
+        files = $$files($$data_file, false)
+        win32:files ~= s|\\\\|/|g
+        for(file, files):!exists($$file/*):FILES += $$file
+    }
+
+    OTHER_FILES += $$FILES
+    copy2build.input = FILES
+    copy2build.output = $$IDE_LIBRARY_PATH/qtcomponents/${QMAKE_FUNC_FILE_IN_stripSrcDir}
+    isEmpty(vcproj):copy2build.variable_out = PRE_TARGETDEPS
+    win32:copy2build.commands = $$QMAKE_COPY \"${QMAKE_FILE_IN}\" \"${QMAKE_FILE_OUT}\"
+    unix:copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
+    copy2build.name = COPY ${QMAKE_FILE_IN}
+    copy2build.CONFIG += no_link
+    QMAKE_EXTRA_COMPILERS += copy2build
+}
+
+!macx {
+    qmlfiles.files = $$PWD/*.qml $$PWD/qmldir $$PWD/images $$PWD/custom
+    qmlfiles.path = /lib/qtcreator/qtcomponents
+    INSTALLS += qmlfiles
+}
diff --git a/qtcreator.pro b/qtcreator.pro
index 6739eb9e40..35f8c20e46 100644
--- a/qtcreator.pro
+++ b/qtcreator.pro
@@ -11,7 +11,7 @@ include(doc/doc.pri)
 TEMPLATE  = subdirs
 CONFIG   += ordered
 
-SUBDIRS = src share
+SUBDIRS = src share lib/qtcreator/qtcomponents
 
 OTHER_FILES += dist/copyright_template.txt \
     dist/changes-1.1.0 \
diff --git a/share/qtcreator/welcomescreen/components/components.pro b/share/qtcreator/welcomescreen/components/components.pro
deleted file mode 100644
index 83e0a3d4c0..0000000000
--- a/share/qtcreator/welcomescreen/components/components.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = styleitem
diff --git a/share/qtcreator/welcomescreen/components/styleitem/styleitem.pro b/share/qtcreator/welcomescreen/components/styleitem/styleitem.pro
deleted file mode 100644
index 25f403a90d..0000000000
--- a/share/qtcreator/welcomescreen/components/styleitem/styleitem.pro
+++ /dev/null
@@ -1,78 +0,0 @@
-TEMPLATE = lib
-CONFIG += qt plugin
-QT += declarative
-QT += script
- 
-TARGET  = styleplugin
-include(../../../../../qtcreator.pri)
-DESTDIR = $$IDE_DATA_PATH/welcomescreen/components/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/share/qtcreator/welcomescreen/develop.qml b/share/qtcreator/welcomescreen/develop.qml
index f4e7defdb9..e8241f8b2e 100644
--- a/share/qtcreator/welcomescreen/develop.qml
+++ b/share/qtcreator/welcomescreen/develop.qml
@@ -32,7 +32,7 @@
 
 import QtQuick 1.0
 import "widgets" as Widgets
-import components 1.0 as Components
+import qtcomponents 1.0 as Components
 
 Item {
     id: root
diff --git a/share/qtcreator/welcomescreen/welcomescreen.pro b/share/qtcreator/welcomescreen/welcomescreen.pro
deleted file mode 100644
index 9728d2ab11..0000000000
--- a/share/qtcreator/welcomescreen/welcomescreen.pro
+++ /dev/null
@@ -1,26 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = components/styleitem
-
-QML_IMPORT_PATH += $$OUT_PWD
-
-OTHER_FILES = develop.qml \
-              gettingstarted.qml \
-              newssupport.qml \
-              welcomescreen.qml \
-              widgets/Button.qml \
-              widgets/CheckBox.qml \
-              widgets/Feedback.qml \
-              widgets/RatingBar.qml \
-              widgets/ExampleBrowser.qml \
-              widgets/LineEdit.qml \
-              widgets/ExampleDelegate.qml \
-              widgets/LinksBar.qml \
-              widgets/HeaderItemView.qml \
-              widgets/RecentSessions.qml \
-              widgets/RecentProjects.qml \
-              widgets/FeaturedAndNewsListing.qml \
-              widgets/NewsListing.qml \
-              widgets/TabWidget.qml \
-              widgets/TagBrowser.qml \
-              examples_fallback.xml \
-              qtcreator_tutorials.xml
diff --git a/share/qtcreator/welcomescreen/welcomescreen.qml b/share/qtcreator/welcomescreen/welcomescreen.qml
index 68f9761ffc..7421e10b79 100644
--- a/share/qtcreator/welcomescreen/welcomescreen.qml
+++ b/share/qtcreator/welcomescreen/welcomescreen.qml
@@ -32,7 +32,7 @@
 
 import QtQuick 1.0
 import "widgets"
-import components 1.0 as Components
+import qtcomponents 1.0 as Components
 
 Rectangle {
     id: root
diff --git a/share/qtcreator/welcomescreen/widgets/Button.qml b/share/qtcreator/welcomescreen/widgets/Button.qml
index ff87fadd09..4c93989177 100644
--- a/share/qtcreator/welcomescreen/widgets/Button.qml
+++ b/share/qtcreator/welcomescreen/widgets/Button.qml
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 import Qt 4.7
-import "../components/custom" as Custom
+import qtcomponents.custom 1.0 as Custom
 
 Custom.Button {
     id: button
diff --git a/share/qtcreator/welcomescreen/widgets/CheckBox.qml b/share/qtcreator/welcomescreen/widgets/CheckBox.qml
index e61299b018..0124c7944f 100644
--- a/share/qtcreator/welcomescreen/widgets/CheckBox.qml
+++ b/share/qtcreator/welcomescreen/widgets/CheckBox.qml
@@ -1,5 +1,5 @@
 import QtQuick 1.0
-import "../components/custom" as Custom
+import qtcomponents.custom 1.0 as Custom
 
 Custom.CheckBox{
     id:checkbox
diff --git a/share/qtcreator/welcomescreen/widgets/ExampleBrowser.qml b/share/qtcreator/welcomescreen/widgets/ExampleBrowser.qml
index e4abd7bcce..b033135ebc 100644
--- a/share/qtcreator/welcomescreen/widgets/ExampleBrowser.qml
+++ b/share/qtcreator/welcomescreen/widgets/ExampleBrowser.qml
@@ -31,8 +31,7 @@
 **************************************************************************/
 
 import QtQuick 1.0
-import components 1.0 as Components
-import widgets 1.0 as Widgets
+import qtcomponents 1.0 as Components
 
 Item {
     id: exampleBrowserRoot
@@ -57,7 +56,7 @@ Item {
         anchors.leftMargin: - 8
         anchors.rightMargin: scrollArea.verticalScrollBar.visible ? 0 : -8
 
-        Widgets.LineEdit {
+        LineEdit {
             id: lineEdit
             placeholderText: !checkBox.checked ? qsTr("Search in Tutorials") : qsTr("Search in Tutorials, Examples and Demos")
             focus: true
diff --git a/share/qtcreator/welcomescreen/widgets/ExampleDelegate.qml b/share/qtcreator/welcomescreen/widgets/ExampleDelegate.qml
index 21106ca15e..4a5a0c2bb3 100644
--- a/share/qtcreator/welcomescreen/widgets/ExampleDelegate.qml
+++ b/share/qtcreator/welcomescreen/widgets/ExampleDelegate.qml
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 import QtQuick 1.0
-import components 1.0 as Components
+import qtcomponents 1.0 as Components
 
 Rectangle {
     id: root
diff --git a/share/qtcreator/welcomescreen/widgets/FeaturedAndNewsListing.qml b/share/qtcreator/welcomescreen/widgets/FeaturedAndNewsListing.qml
index 9373d6ffb6..7870efacfd 100644
--- a/share/qtcreator/welcomescreen/widgets/FeaturedAndNewsListing.qml
+++ b/share/qtcreator/welcomescreen/widgets/FeaturedAndNewsListing.qml
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 import QtQuick 1.0
-import components 1.0 as Components
+import qtcomponents 1.0 as Components
 
 Item {
     InsetText {
diff --git a/share/qtcreator/welcomescreen/widgets/Feedback.qml b/share/qtcreator/welcomescreen/widgets/Feedback.qml
index d84a151ebd..9fb685d184 100644
--- a/share/qtcreator/welcomescreen/widgets/Feedback.qml
+++ b/share/qtcreator/welcomescreen/widgets/Feedback.qml
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 import QtQuick 1.0
-import components 1.0 as Components
+import qtcomponents 1.0 as Components
 
 Rectangle {
     id: inner_background
diff --git a/share/qtcreator/welcomescreen/widgets/LineEdit.qml b/share/qtcreator/welcomescreen/widgets/LineEdit.qml
index b6e30e96f7..163db18bda 100644
--- a/share/qtcreator/welcomescreen/widgets/LineEdit.qml
+++ b/share/qtcreator/welcomescreen/widgets/LineEdit.qml
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 import QtQuick 1.0
-import "../components/custom" as Custom
+import qtcomponents.custom 1.0 as Custom
 
 
 Custom.TextField {
diff --git a/share/qtcreator/welcomescreen/widgets/LinksBar.qml b/share/qtcreator/welcomescreen/widgets/LinksBar.qml
index dbf3ce55b3..8be29fa349 100644
--- a/share/qtcreator/welcomescreen/widgets/LinksBar.qml
+++ b/share/qtcreator/welcomescreen/widgets/LinksBar.qml
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 import QtQuick 1.0
-import components 1.0 as Components
+import qtcomponents 1.0 as Components
 
 Row {
     id: tabBar
diff --git a/share/qtcreator/welcomescreen/widgets/NewsListing.qml b/share/qtcreator/welcomescreen/widgets/NewsListing.qml
index 033ce7ce8b..98fad9558d 100644
--- a/share/qtcreator/welcomescreen/widgets/NewsListing.qml
+++ b/share/qtcreator/welcomescreen/widgets/NewsListing.qml
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 import QtQuick 1.1
-import components 1.0 as Components
+import qtcomponents 1.0 as Components
 
 Item {
     id: root
diff --git a/share/qtcreator/welcomescreen/widgets/RecentProjects.qml b/share/qtcreator/welcomescreen/widgets/RecentProjects.qml
index 0c620bbd9b..6ead30af36 100644
--- a/share/qtcreator/welcomescreen/widgets/RecentProjects.qml
+++ b/share/qtcreator/welcomescreen/widgets/RecentProjects.qml
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 import QtQuick 1.1
-import components 1.0 as Components
+import qtcomponents 1.0 as Components
 
 HeaderItemView {
     header: qsTr("Recently Edited Projects")
diff --git a/share/qtcreator/welcomescreen/widgets/RecentSessions.qml b/share/qtcreator/welcomescreen/widgets/RecentSessions.qml
index 03e3d2ddc4..4f99da6295 100644
--- a/share/qtcreator/welcomescreen/widgets/RecentSessions.qml
+++ b/share/qtcreator/welcomescreen/widgets/RecentSessions.qml
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 import QtQuick 1.0
-import components 1.0 as Components
+import qtcomponents 1.0 as Components
 
 HeaderItemView {
     header: qsTr("Recently Used Sessions")
diff --git a/share/share.pro b/share/share.pro
index df8f06e11e..69509a0098 100644
--- a/share/share.pro
+++ b/share/share.pro
@@ -1,4 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS = qtcreator/static.pro \
-          qtcreator/translations \
-          qtcreator/welcomescreen
+          qtcreator/translations
diff --git a/src/libs/libs.pro b/src/libs/libs.pro
index f33e687774..6b387192fa 100644
--- a/src/libs/libs.pro
+++ b/src/libs/libs.pro
@@ -14,6 +14,7 @@ SUBDIRS   = \
     qmljs \
     glsl \
     qmleditorwidgets \
+    qtcomponents/styleitem \
     symbianutils
 
 # Windows: Compile Qt Creator CDB extension if Debugging tools can be detected.    
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qdeclarativefolderlistmodel.cpp b/src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.cpp
index dda23630c0..dda23630c0 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qdeclarativefolderlistmodel.cpp
+++ b/src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.cpp
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qdeclarativefolderlistmodel.h b/src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.h
index 9beb4d575e..9beb4d575e 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qdeclarativefolderlistmodel.h
+++ b/src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.h
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qrangemodel.cpp b/src/libs/qtcomponents/styleitem/qrangemodel.cpp
index 0eb29fa45c..0eb29fa45c 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qrangemodel.cpp
+++ b/src/libs/qtcomponents/styleitem/qrangemodel.cpp
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qrangemodel.h b/src/libs/qtcomponents/styleitem/qrangemodel.h
index 744ae348e5..744ae348e5 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qrangemodel.h
+++ b/src/libs/qtcomponents/styleitem/qrangemodel.h
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qrangemodel_p.h b/src/libs/qtcomponents/styleitem/qrangemodel_p.h
index 8cfeeae4a9..8cfeeae4a9 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qrangemodel_p.h
+++ b/src/libs/qtcomponents/styleitem/qrangemodel_p.h
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qstyleitem.cpp b/src/libs/qtcomponents/styleitem/qstyleitem.cpp
index ccb56b1237..ccb56b1237 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qstyleitem.cpp
+++ b/src/libs/qtcomponents/styleitem/qstyleitem.cpp
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qstyleitem.h b/src/libs/qtcomponents/styleitem/qstyleitem.h
index 83233d810e..83233d810e 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qstyleitem.h
+++ b/src/libs/qtcomponents/styleitem/qstyleitem.h
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qstyleplugin.cpp b/src/libs/qtcomponents/styleitem/qstyleplugin.cpp
index 6ba3473839..6ba3473839 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qstyleplugin.cpp
+++ b/src/libs/qtcomponents/styleitem/qstyleplugin.cpp
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qstyleplugin.h b/src/libs/qtcomponents/styleitem/qstyleplugin.h
index 144cb48aff..144cb48aff 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qstyleplugin.h
+++ b/src/libs/qtcomponents/styleitem/qstyleplugin.h
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qtmenu.cpp b/src/libs/qtcomponents/styleitem/qtmenu.cpp
index 55bea2ce45..55bea2ce45 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qtmenu.cpp
+++ b/src/libs/qtcomponents/styleitem/qtmenu.cpp
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qtmenu.h b/src/libs/qtcomponents/styleitem/qtmenu.h
index d22dc1f822..d22dc1f822 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qtmenu.h
+++ b/src/libs/qtcomponents/styleitem/qtmenu.h
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qtmenubar.cpp b/src/libs/qtcomponents/styleitem/qtmenubar.cpp
index b50331be74..b50331be74 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qtmenubar.cpp
+++ b/src/libs/qtcomponents/styleitem/qtmenubar.cpp
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qtmenubar.h b/src/libs/qtcomponents/styleitem/qtmenubar.h
index 241a098ab7..241a098ab7 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qtmenubar.h
+++ b/src/libs/qtcomponents/styleitem/qtmenubar.h
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qtmenuitem.cpp b/src/libs/qtcomponents/styleitem/qtmenuitem.cpp
index a946542894..a946542894 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qtmenuitem.cpp
+++ b/src/libs/qtcomponents/styleitem/qtmenuitem.cpp
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qtmenuitem.h b/src/libs/qtcomponents/styleitem/qtmenuitem.h
index 5fc47e2c92..5fc47e2c92 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qtmenuitem.h
+++ b/src/libs/qtcomponents/styleitem/qtmenuitem.h
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qwheelarea.cpp b/src/libs/qtcomponents/styleitem/qwheelarea.cpp
index a3610c54c8..a3610c54c8 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qwheelarea.cpp
+++ b/src/libs/qtcomponents/styleitem/qwheelarea.cpp
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qwheelarea.h b/src/libs/qtcomponents/styleitem/qwheelarea.h
index cf71847c76..cf71847c76 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qwheelarea.h
+++ b/src/libs/qtcomponents/styleitem/qwheelarea.h
diff --git a/src/libs/qtcomponents/styleitem/styleitem.pro b/src/libs/qtcomponents/styleitem/styleitem.pro
new file mode 100644
index 0000000000..aa52c88a13
--- /dev/null
+++ b/src/libs/qtcomponents/styleitem/styleitem.pro
@@ -0,0 +1,34 @@
+TEMPLATE = lib
+CONFIG += qt plugin
+QT += declarative
+QT += script
+
+TARGET  = styleplugin
+include(../../../../qtcreator.pri)
+DESTDIR = $$IDE_LIBRARY_PATH/qtcomponents/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
+
+!macx {
+    target.path = /lib/qtcreator/qtcomponents/plugin
+    INSTALLS += target
+}
diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp
index 85b40f286e..9be13f2b0b 100644
--- a/src/plugins/welcome/welcomeplugin.cpp
+++ b/src/plugins/welcome/welcomeplugin.cpp
@@ -53,6 +53,8 @@
 #include <QtGui/QPainter>
 #include <QtGui/QHBoxLayout>
 
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDir>
 #include <QtCore/QSettings>
 #include <QtCore/QDebug>
 #include <QtCore/QUrl>
@@ -224,7 +226,13 @@ void WelcomeMode::initPlugins()
     if (!debug)
         engine->setOutputWarningsToStandardError(false);
     engine->setNetworkAccessManagerFactory(new NetworkAccessManagerFactory);
-    engine->addImportPath(Core::ICore::instance()->resourcePath() + "/welcomescreen");
+    QString pluginPath = QCoreApplication::applicationDirPath();
+#ifdef Q_OS_MAC
+    pluginPath += QLatin1String("/../PlugIns");
+#else
+    pluginPath += QLatin1String("/../" IDE_LIBRARY_BASENAME "/qtcreator");
+#endif
+    engine->addImportPath(QDir::cleanPath(pluginPath));
     facilitateQml(engine);
     foreach (Utils::IWelcomePage *plugin, plugins) {
         plugin->facilitateQml(engine);