diff --git a/share/qtcreator/welcomescreen/components/Button.qml b/lib/qtcreator/qtcomponents/Button.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/Button.qml
rename to lib/qtcreator/qtcomponents/Button.qml
diff --git a/share/qtcreator/welcomescreen/components/ButtonRow.qml b/lib/qtcreator/qtcomponents/ButtonRow.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/ButtonRow.qml
rename to lib/qtcreator/qtcomponents/ButtonRow.qml
diff --git a/share/qtcreator/welcomescreen/components/CheckBox.qml b/lib/qtcreator/qtcomponents/CheckBox.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/CheckBox.qml
rename to lib/qtcreator/qtcomponents/CheckBox.qml
diff --git a/share/qtcreator/welcomescreen/components/ChoiceList.qml b/lib/qtcreator/qtcomponents/ChoiceList.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/ChoiceList.qml
rename to lib/qtcreator/qtcomponents/ChoiceList.qml
diff --git a/share/qtcreator/welcomescreen/components/ContextMenu.qml b/lib/qtcreator/qtcomponents/ContextMenu.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/ContextMenu.qml
rename to lib/qtcreator/qtcomponents/ContextMenu.qml
diff --git a/share/qtcreator/welcomescreen/components/Dial.qml b/lib/qtcreator/qtcomponents/Dial.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/Dial.qml
rename to lib/qtcreator/qtcomponents/Dial.qml
diff --git a/share/qtcreator/welcomescreen/components/Frame.qml b/lib/qtcreator/qtcomponents/Frame.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/Frame.qml
rename to lib/qtcreator/qtcomponents/Frame.qml
diff --git a/share/qtcreator/welcomescreen/components/GroupBox.qml b/lib/qtcreator/qtcomponents/GroupBox.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/GroupBox.qml
rename to lib/qtcreator/qtcomponents/GroupBox.qml
diff --git a/share/qtcreator/welcomescreen/components/Menu.qml b/lib/qtcreator/qtcomponents/Menu.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/Menu.qml
rename to lib/qtcreator/qtcomponents/Menu.qml
diff --git a/share/qtcreator/welcomescreen/components/MenuItem.qml b/lib/qtcreator/qtcomponents/MenuItem.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/MenuItem.qml
rename to lib/qtcreator/qtcomponents/MenuItem.qml
diff --git a/share/qtcreator/welcomescreen/components/ProgressBar.qml b/lib/qtcreator/qtcomponents/ProgressBar.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/ProgressBar.qml
rename to lib/qtcreator/qtcomponents/ProgressBar.qml
diff --git a/share/qtcreator/welcomescreen/components/RadioButton.qml b/lib/qtcreator/qtcomponents/RadioButton.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/RadioButton.qml
rename to lib/qtcreator/qtcomponents/RadioButton.qml
diff --git a/share/qtcreator/welcomescreen/components/ScrollArea.qml b/lib/qtcreator/qtcomponents/ScrollArea.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/ScrollArea.qml
rename to lib/qtcreator/qtcomponents/ScrollArea.qml
diff --git a/share/qtcreator/welcomescreen/components/ScrollBar.qml b/lib/qtcreator/qtcomponents/ScrollBar.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/ScrollBar.qml
rename to lib/qtcreator/qtcomponents/ScrollBar.qml
diff --git a/share/qtcreator/welcomescreen/components/Slider.qml b/lib/qtcreator/qtcomponents/Slider.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/Slider.qml
rename to lib/qtcreator/qtcomponents/Slider.qml
diff --git a/share/qtcreator/welcomescreen/components/SpinBox.qml b/lib/qtcreator/qtcomponents/SpinBox.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/SpinBox.qml
rename to lib/qtcreator/qtcomponents/SpinBox.qml
diff --git a/share/qtcreator/welcomescreen/components/SplitterRow.qml b/lib/qtcreator/qtcomponents/SplitterRow.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/SplitterRow.qml
rename to lib/qtcreator/qtcomponents/SplitterRow.qml
diff --git a/share/qtcreator/welcomescreen/components/Switch.qml b/lib/qtcreator/qtcomponents/Switch.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/Switch.qml
rename to lib/qtcreator/qtcomponents/Switch.qml
diff --git a/share/qtcreator/welcomescreen/components/Tab.qml b/lib/qtcreator/qtcomponents/Tab.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/Tab.qml
rename to lib/qtcreator/qtcomponents/Tab.qml
diff --git a/share/qtcreator/welcomescreen/components/TabBar.qml b/lib/qtcreator/qtcomponents/TabBar.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/TabBar.qml
rename to lib/qtcreator/qtcomponents/TabBar.qml
diff --git a/share/qtcreator/welcomescreen/components/TabFrame.qml b/lib/qtcreator/qtcomponents/TabFrame.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/TabFrame.qml
rename to lib/qtcreator/qtcomponents/TabFrame.qml
diff --git a/share/qtcreator/welcomescreen/components/TableColumn.qml b/lib/qtcreator/qtcomponents/TableColumn.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/TableColumn.qml
rename to lib/qtcreator/qtcomponents/TableColumn.qml
diff --git a/share/qtcreator/welcomescreen/components/TableView.qml b/lib/qtcreator/qtcomponents/TableView.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/TableView.qml
rename to lib/qtcreator/qtcomponents/TableView.qml
diff --git a/share/qtcreator/welcomescreen/components/TextArea.qml b/lib/qtcreator/qtcomponents/TextArea.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/TextArea.qml
rename to lib/qtcreator/qtcomponents/TextArea.qml
diff --git a/share/qtcreator/welcomescreen/components/TextField.qml b/lib/qtcreator/qtcomponents/TextField.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/TextField.qml
rename to lib/qtcreator/qtcomponents/TextField.qml
diff --git a/share/qtcreator/welcomescreen/components/ToolBar.qml b/lib/qtcreator/qtcomponents/ToolBar.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/ToolBar.qml
rename to lib/qtcreator/qtcomponents/ToolBar.qml
diff --git a/share/qtcreator/welcomescreen/components/ToolButton.qml b/lib/qtcreator/qtcomponents/ToolButton.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/ToolButton.qml
rename to lib/qtcreator/qtcomponents/ToolButton.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/BasicButton.qml b/lib/qtcreator/qtcomponents/custom/BasicButton.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/custom/BasicButton.qml
rename to lib/qtcreator/qtcomponents/custom/BasicButton.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/Button.qml b/lib/qtcreator/qtcomponents/custom/Button.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/custom/Button.qml
rename to lib/qtcreator/qtcomponents/custom/Button.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/ButtonColumn.qml b/lib/qtcreator/qtcomponents/custom/ButtonColumn.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/custom/ButtonColumn.qml
rename to lib/qtcreator/qtcomponents/custom/ButtonColumn.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/ButtonGroup.js b/lib/qtcreator/qtcomponents/custom/ButtonGroup.js
similarity index 100%
rename from share/qtcreator/welcomescreen/components/custom/ButtonGroup.js
rename to lib/qtcreator/qtcomponents/custom/ButtonGroup.js
diff --git a/share/qtcreator/welcomescreen/components/custom/ButtonRow.qml b/lib/qtcreator/qtcomponents/custom/ButtonRow.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/custom/ButtonRow.qml
rename to lib/qtcreator/qtcomponents/custom/ButtonRow.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/CheckBox.qml b/lib/qtcreator/qtcomponents/custom/CheckBox.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/custom/CheckBox.qml
rename to lib/qtcreator/qtcomponents/custom/CheckBox.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/ChoiceList.qml b/lib/qtcreator/qtcomponents/custom/ChoiceList.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/custom/ChoiceList.qml
rename to lib/qtcreator/qtcomponents/custom/ChoiceList.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/GroupBox.qml b/lib/qtcreator/qtcomponents/custom/GroupBox.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/custom/GroupBox.qml
rename to lib/qtcreator/qtcomponents/custom/GroupBox.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/ProgressBar.qml b/lib/qtcreator/qtcomponents/custom/ProgressBar.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/custom/ProgressBar.qml
rename to lib/qtcreator/qtcomponents/custom/ProgressBar.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/Slider.qml b/lib/qtcreator/qtcomponents/custom/Slider.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/custom/Slider.qml
rename to lib/qtcreator/qtcomponents/custom/Slider.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/SpinBox.qml b/lib/qtcreator/qtcomponents/custom/SpinBox.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/custom/SpinBox.qml
rename to lib/qtcreator/qtcomponents/custom/SpinBox.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/SplitterRow.qml b/lib/qtcreator/qtcomponents/custom/SplitterRow.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/custom/SplitterRow.qml
rename to lib/qtcreator/qtcomponents/custom/SplitterRow.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/TextField.qml b/lib/qtcreator/qtcomponents/custom/TextField.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/components/custom/TextField.qml
rename to 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
similarity index 100%
rename from share/qtcreator/welcomescreen/components/custom/behaviors/ButtonBehavior.qml
rename to 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
similarity index 100%
rename from share/qtcreator/welcomescreen/components/custom/behaviors/ModalPopupBehavior.qml
rename to lib/qtcreator/qtcomponents/custom/behaviors/ModalPopupBehavior.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/components.pro b/lib/qtcreator/qtcomponents/custom/components.pro
similarity index 100%
rename from share/qtcreator/welcomescreen/components/custom/components.pro
rename to 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
similarity index 100%
rename from share/qtcreator/welcomescreen/components/custom/private/ChoiceListPopup.qml
rename to lib/qtcreator/qtcomponents/custom/private/ChoiceListPopup.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/qmldir b/lib/qtcreator/qtcomponents/custom/qmldir
similarity index 100%
rename from share/qtcreator/welcomescreen/components/custom/qmldir
rename to lib/qtcreator/qtcomponents/custom/qmldir
diff --git a/share/qtcreator/welcomescreen/components/images/folder_new.png b/lib/qtcreator/qtcomponents/images/folder_new.png
similarity index 100%
rename from share/qtcreator/welcomescreen/components/images/folder_new.png
rename to lib/qtcreator/qtcomponents/images/folder_new.png
diff --git a/share/qtcreator/welcomescreen/components/qmldir b/lib/qtcreator/qtcomponents/qmldir
similarity index 100%
rename from share/qtcreator/welcomescreen/components/qmldir
rename to lib/qtcreator/qtcomponents/qmldir
diff --git a/lib/qtcreator/qtcomponents/qtcomponents.pro b/lib/qtcreator/qtcomponents/qtcomponents.pro
new file mode 100644
index 0000000000000000000000000000000000000000..9a3dc0e67fbb6cdfed7c1eb5e6fa652830e7d854
--- /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 6739eb9e40f96f70f081d06a89252c3b910aaa0f..35f8c20e46d57ab90e6789c2b0e7f19eb5ce3697 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 83e0a3d4c0b4f86c82ef65d0f88bcf168f12c7c0..0000000000000000000000000000000000000000
--- 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 25f403a90de26d9bb495a74a3574c66882ff03e4..0000000000000000000000000000000000000000
--- 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 f4e7defdb99f2fc4dacc2fb47fd5acf0f1f7a057..e8241f8b2e7e1e0b3cfb683ef613361176c85bb4 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 9728d2ab11c29a7c68809b3e20859db415c19097..0000000000000000000000000000000000000000
--- 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 68f9761ffc582e0aa3d7dd3e98fe6eb9a41143bb..7421e10b799b8db8693cd119020bd91376a2e0ed 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 ff87fadd09747c23844bb0410d29fd9b353c01b3..4c93989177427154deed50fbbe62fbc872922a31 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 e61299b018b27089e024daedd54abc0a5eae7b04..0124c7944f9b89c9f10b7ec616dbad11c9fd08e6 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 e4abd7bcce1393753d1542066eefa41d876a1d7d..b033135ebc21f0ef0ffc0ed565fc328fc2468405 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 21106ca15e5df741ae346d286e2ffb829b8eb90b..4a5a0c2bb33552910d44bcbfdf5ee0f4189b8a63 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 9373d6ffb65a36014da62cad6a8785f569a55528..7870efacfdda2111557ef35a96cfc8f209cd777b 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 d84a151ebd2ce96178c8200e8c39e2d840c6b34c..9fb685d184084993eb4e64ea652bce86be6b0a8a 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 b6e30e96f7caaa6fc6a21228b80da71bc7adc609..163db18bda0e180a08e2cf36dd5e0fa985e032cc 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 dbf3ce55b36b988b394e77eab88a8f2dcdecd415..8be29fa349f10da65402fe2f0337fca21df2ada0 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 033ce7ce8bd19c37502eb752d40d5e18367d3615..98fad9558dfd4beb397987f8757c85f0633e0c7c 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 0c620bbd9b90a13663d8b6a93c0cd472352c11c0..6ead30af36ef8b0ee99412a84ae112db9d3509a3 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 03e3d2ddc483f9c2db0bf222c113ba36ebace74d..4f99da6295c4238c1821a7c2f8064b5046950671 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 df8f06e11ecd678a2ca87ed254ec6a8eb8388310..69509a0098b86bc5788fb4fe04d875ebf6a07965 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 f33e687774f5c5803230b366b97bd5c60038b35e..6b387192fadbd9de5e265bccf99679dce5523d42 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
similarity index 100%
rename from share/qtcreator/welcomescreen/components/styleitem/qdeclarativefolderlistmodel.cpp
rename to src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.cpp
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qdeclarativefolderlistmodel.h b/src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.h
similarity index 100%
rename from share/qtcreator/welcomescreen/components/styleitem/qdeclarativefolderlistmodel.h
rename to src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.h
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qrangemodel.cpp b/src/libs/qtcomponents/styleitem/qrangemodel.cpp
similarity index 100%
rename from share/qtcreator/welcomescreen/components/styleitem/qrangemodel.cpp
rename to src/libs/qtcomponents/styleitem/qrangemodel.cpp
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qrangemodel.h b/src/libs/qtcomponents/styleitem/qrangemodel.h
similarity index 100%
rename from share/qtcreator/welcomescreen/components/styleitem/qrangemodel.h
rename to 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
similarity index 100%
rename from share/qtcreator/welcomescreen/components/styleitem/qrangemodel_p.h
rename to src/libs/qtcomponents/styleitem/qrangemodel_p.h
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qstyleitem.cpp b/src/libs/qtcomponents/styleitem/qstyleitem.cpp
similarity index 100%
rename from share/qtcreator/welcomescreen/components/styleitem/qstyleitem.cpp
rename to src/libs/qtcomponents/styleitem/qstyleitem.cpp
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qstyleitem.h b/src/libs/qtcomponents/styleitem/qstyleitem.h
similarity index 100%
rename from share/qtcreator/welcomescreen/components/styleitem/qstyleitem.h
rename to src/libs/qtcomponents/styleitem/qstyleitem.h
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qstyleplugin.cpp b/src/libs/qtcomponents/styleitem/qstyleplugin.cpp
similarity index 100%
rename from share/qtcreator/welcomescreen/components/styleitem/qstyleplugin.cpp
rename to src/libs/qtcomponents/styleitem/qstyleplugin.cpp
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qstyleplugin.h b/src/libs/qtcomponents/styleitem/qstyleplugin.h
similarity index 100%
rename from share/qtcreator/welcomescreen/components/styleitem/qstyleplugin.h
rename to src/libs/qtcomponents/styleitem/qstyleplugin.h
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qtmenu.cpp b/src/libs/qtcomponents/styleitem/qtmenu.cpp
similarity index 100%
rename from share/qtcreator/welcomescreen/components/styleitem/qtmenu.cpp
rename to src/libs/qtcomponents/styleitem/qtmenu.cpp
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qtmenu.h b/src/libs/qtcomponents/styleitem/qtmenu.h
similarity index 100%
rename from share/qtcreator/welcomescreen/components/styleitem/qtmenu.h
rename to src/libs/qtcomponents/styleitem/qtmenu.h
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qtmenubar.cpp b/src/libs/qtcomponents/styleitem/qtmenubar.cpp
similarity index 100%
rename from share/qtcreator/welcomescreen/components/styleitem/qtmenubar.cpp
rename to src/libs/qtcomponents/styleitem/qtmenubar.cpp
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qtmenubar.h b/src/libs/qtcomponents/styleitem/qtmenubar.h
similarity index 100%
rename from share/qtcreator/welcomescreen/components/styleitem/qtmenubar.h
rename to src/libs/qtcomponents/styleitem/qtmenubar.h
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qtmenuitem.cpp b/src/libs/qtcomponents/styleitem/qtmenuitem.cpp
similarity index 100%
rename from share/qtcreator/welcomescreen/components/styleitem/qtmenuitem.cpp
rename to src/libs/qtcomponents/styleitem/qtmenuitem.cpp
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qtmenuitem.h b/src/libs/qtcomponents/styleitem/qtmenuitem.h
similarity index 100%
rename from share/qtcreator/welcomescreen/components/styleitem/qtmenuitem.h
rename to src/libs/qtcomponents/styleitem/qtmenuitem.h
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qwheelarea.cpp b/src/libs/qtcomponents/styleitem/qwheelarea.cpp
similarity index 100%
rename from share/qtcreator/welcomescreen/components/styleitem/qwheelarea.cpp
rename to src/libs/qtcomponents/styleitem/qwheelarea.cpp
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qwheelarea.h b/src/libs/qtcomponents/styleitem/qwheelarea.h
similarity index 100%
rename from share/qtcreator/welcomescreen/components/styleitem/qwheelarea.h
rename to 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 0000000000000000000000000000000000000000..aa52c88a1364a5bbf8a8c6b8da80dd560957c8fe
--- /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 85b40f286e21dab2c4418a6a890c1f1220d40f37..9be13f2b0b095f6eba66509cdc9a2aa00cbb3ce5 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);