From 9743b43663f2dac99df0e1e5219b0d65bee2d7f2 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Tue, 2 Aug 2011 17:11:29 +0200 Subject: [PATCH] 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 Reviewed-by: Oswald Buddenhagen Reviewed-by: Eike Ziller --- .../qtcreator/qtcomponents}/Button.qml | 0 .../qtcreator/qtcomponents}/ButtonRow.qml | 0 .../qtcreator/qtcomponents}/CheckBox.qml | 0 .../qtcreator/qtcomponents}/ChoiceList.qml | 0 .../qtcreator/qtcomponents}/ContextMenu.qml | 0 .../qtcreator/qtcomponents}/Dial.qml | 0 .../qtcreator/qtcomponents}/Frame.qml | 0 .../qtcreator/qtcomponents}/GroupBox.qml | 0 .../qtcreator/qtcomponents}/Menu.qml | 0 .../qtcreator/qtcomponents}/MenuItem.qml | 0 .../qtcreator/qtcomponents}/ProgressBar.qml | 0 .../qtcreator/qtcomponents}/RadioButton.qml | 0 .../qtcreator/qtcomponents}/ScrollArea.qml | 0 .../qtcreator/qtcomponents}/ScrollBar.qml | 0 .../qtcreator/qtcomponents}/Slider.qml | 0 .../qtcreator/qtcomponents}/SpinBox.qml | 0 .../qtcreator/qtcomponents}/SplitterRow.qml | 0 .../qtcreator/qtcomponents}/Switch.qml | 0 .../qtcreator/qtcomponents}/Tab.qml | 0 .../qtcreator/qtcomponents}/TabBar.qml | 0 .../qtcreator/qtcomponents}/TabFrame.qml | 0 .../qtcreator/qtcomponents}/TableColumn.qml | 0 .../qtcreator/qtcomponents}/TableView.qml | 0 .../qtcreator/qtcomponents}/TextArea.qml | 0 .../qtcreator/qtcomponents}/TextField.qml | 0 .../qtcreator/qtcomponents}/ToolBar.qml | 0 .../qtcreator/qtcomponents}/ToolButton.qml | 0 .../qtcomponents}/custom/BasicButton.qml | 0 .../qtcreator/qtcomponents}/custom/Button.qml | 0 .../qtcomponents}/custom/ButtonColumn.qml | 0 .../qtcomponents}/custom/ButtonGroup.js | 0 .../qtcomponents}/custom/ButtonRow.qml | 0 .../qtcomponents}/custom/CheckBox.qml | 0 .../qtcomponents}/custom/ChoiceList.qml | 0 .../qtcomponents}/custom/GroupBox.qml | 0 .../qtcomponents}/custom/ProgressBar.qml | 0 .../qtcreator/qtcomponents}/custom/Slider.qml | 0 .../qtcomponents}/custom/SpinBox.qml | 0 .../qtcomponents}/custom/SplitterRow.qml | 0 .../qtcomponents}/custom/TextField.qml | 0 .../custom/behaviors/ButtonBehavior.qml | 0 .../custom/behaviors/ModalPopupBehavior.qml | 0 .../qtcomponents}/custom/components.pro | 0 .../custom/private/ChoiceListPopup.qml | 0 .../qtcreator/qtcomponents}/custom/qmldir | 0 .../qtcomponents}/images/folder_new.png | Bin .../qtcreator/qtcomponents}/qmldir | 0 lib/qtcreator/qtcomponents/qtcomponents.pro | 57 +++++++++++++ qtcreator.pro | 2 +- .../welcomescreen/components/components.pro | 2 - .../components/styleitem/styleitem.pro | 78 ------------------ share/qtcreator/welcomescreen/develop.qml | 2 +- .../qtcreator/welcomescreen/welcomescreen.pro | 26 ------ .../qtcreator/welcomescreen/welcomescreen.qml | 2 +- .../welcomescreen/widgets/Button.qml | 2 +- .../welcomescreen/widgets/CheckBox.qml | 2 +- .../welcomescreen/widgets/ExampleBrowser.qml | 5 +- .../welcomescreen/widgets/ExampleDelegate.qml | 2 +- .../widgets/FeaturedAndNewsListing.qml | 2 +- .../welcomescreen/widgets/Feedback.qml | 2 +- .../welcomescreen/widgets/LineEdit.qml | 2 +- .../welcomescreen/widgets/LinksBar.qml | 2 +- .../welcomescreen/widgets/NewsListing.qml | 2 +- .../welcomescreen/widgets/RecentProjects.qml | 2 +- .../welcomescreen/widgets/RecentSessions.qml | 2 +- share/share.pro | 3 +- src/libs/libs.pro | 1 + .../styleitem/qdeclarativefolderlistmodel.cpp | 0 .../styleitem/qdeclarativefolderlistmodel.h | 0 .../qtcomponents}/styleitem/qrangemodel.cpp | 0 .../qtcomponents}/styleitem/qrangemodel.h | 0 .../qtcomponents}/styleitem/qrangemodel_p.h | 0 .../qtcomponents}/styleitem/qstyleitem.cpp | 0 .../libs/qtcomponents}/styleitem/qstyleitem.h | 0 .../qtcomponents}/styleitem/qstyleplugin.cpp | 0 .../qtcomponents}/styleitem/qstyleplugin.h | 0 .../libs/qtcomponents}/styleitem/qtmenu.cpp | 0 .../libs/qtcomponents}/styleitem/qtmenu.h | 0 .../qtcomponents}/styleitem/qtmenubar.cpp | 0 .../libs/qtcomponents}/styleitem/qtmenubar.h | 0 .../qtcomponents}/styleitem/qtmenuitem.cpp | 0 .../libs/qtcomponents}/styleitem/qtmenuitem.h | 0 .../qtcomponents}/styleitem/qwheelarea.cpp | 0 .../libs/qtcomponents}/styleitem/qwheelarea.h | 0 src/libs/qtcomponents/styleitem/styleitem.pro | 34 ++++++++ src/plugins/welcome/welcomeplugin.cpp | 10 ++- 86 files changed, 117 insertions(+), 125 deletions(-) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/Button.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/ButtonRow.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/CheckBox.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/ChoiceList.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/ContextMenu.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/Dial.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/Frame.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/GroupBox.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/Menu.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/MenuItem.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/ProgressBar.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/RadioButton.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/ScrollArea.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/ScrollBar.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/Slider.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/SpinBox.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/SplitterRow.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/Switch.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/Tab.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/TabBar.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/TabFrame.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/TableColumn.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/TableView.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/TextArea.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/TextField.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/ToolBar.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/ToolButton.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/custom/BasicButton.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/custom/Button.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/custom/ButtonColumn.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/custom/ButtonGroup.js (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/custom/ButtonRow.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/custom/CheckBox.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/custom/ChoiceList.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/custom/GroupBox.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/custom/ProgressBar.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/custom/Slider.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/custom/SpinBox.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/custom/SplitterRow.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/custom/TextField.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/custom/behaviors/ButtonBehavior.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/custom/behaviors/ModalPopupBehavior.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/custom/components.pro (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/custom/private/ChoiceListPopup.qml (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/custom/qmldir (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/images/folder_new.png (100%) rename {share/qtcreator/welcomescreen/components => lib/qtcreator/qtcomponents}/qmldir (100%) create mode 100644 lib/qtcreator/qtcomponents/qtcomponents.pro delete mode 100644 share/qtcreator/welcomescreen/components/components.pro delete mode 100644 share/qtcreator/welcomescreen/components/styleitem/styleitem.pro delete mode 100644 share/qtcreator/welcomescreen/welcomescreen.pro rename {share/qtcreator/welcomescreen/components => src/libs/qtcomponents}/styleitem/qdeclarativefolderlistmodel.cpp (100%) rename {share/qtcreator/welcomescreen/components => src/libs/qtcomponents}/styleitem/qdeclarativefolderlistmodel.h (100%) rename {share/qtcreator/welcomescreen/components => src/libs/qtcomponents}/styleitem/qrangemodel.cpp (100%) rename {share/qtcreator/welcomescreen/components => src/libs/qtcomponents}/styleitem/qrangemodel.h (100%) rename {share/qtcreator/welcomescreen/components => src/libs/qtcomponents}/styleitem/qrangemodel_p.h (100%) rename {share/qtcreator/welcomescreen/components => src/libs/qtcomponents}/styleitem/qstyleitem.cpp (100%) rename {share/qtcreator/welcomescreen/components => src/libs/qtcomponents}/styleitem/qstyleitem.h (100%) rename {share/qtcreator/welcomescreen/components => src/libs/qtcomponents}/styleitem/qstyleplugin.cpp (100%) rename {share/qtcreator/welcomescreen/components => src/libs/qtcomponents}/styleitem/qstyleplugin.h (100%) rename {share/qtcreator/welcomescreen/components => src/libs/qtcomponents}/styleitem/qtmenu.cpp (100%) rename {share/qtcreator/welcomescreen/components => src/libs/qtcomponents}/styleitem/qtmenu.h (100%) rename {share/qtcreator/welcomescreen/components => src/libs/qtcomponents}/styleitem/qtmenubar.cpp (100%) rename {share/qtcreator/welcomescreen/components => src/libs/qtcomponents}/styleitem/qtmenubar.h (100%) rename {share/qtcreator/welcomescreen/components => src/libs/qtcomponents}/styleitem/qtmenuitem.cpp (100%) rename {share/qtcreator/welcomescreen/components => src/libs/qtcomponents}/styleitem/qtmenuitem.h (100%) rename {share/qtcreator/welcomescreen/components => src/libs/qtcomponents}/styleitem/qwheelarea.cpp (100%) rename {share/qtcreator/welcomescreen/components => src/libs/qtcomponents}/styleitem/qwheelarea.h (100%) create mode 100644 src/libs/qtcomponents/styleitem/styleitem.pro 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 00000000000..9a3dc0e67fb --- /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 6739eb9e40f..35f8c20e46d 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 83e0a3d4c0b..00000000000 --- 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 25f403a90de..00000000000 --- 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 f4e7defdb99..e8241f8b2e7 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 9728d2ab11c..00000000000 --- 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 68f9761ffc5..7421e10b799 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 ff87fadd097..4c939891774 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 e61299b018b..0124c7944f9 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 e4abd7bcce1..b033135ebc2 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 21106ca15e5..4a5a0c2bb33 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 9373d6ffb65..7870efacfdd 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 d84a151ebd2..9fb685d1840 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 b6e30e96f7c..163db18bda0 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 dbf3ce55b36..8be29fa349f 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 033ce7ce8bd..98fad9558df 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 0c620bbd9b9..6ead30af36e 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 03e3d2ddc48..4f99da6295c 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 df8f06e11ec..69509a0098b 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 f33e687774f..6b387192fad 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 00000000000..aa52c88a136 --- /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 85b40f286e2..9be13f2b0b0 100644 --- a/src/plugins/welcome/welcomeplugin.cpp +++ b/src/plugins/welcome/welcomeplugin.cpp @@ -53,6 +53,8 @@ #include #include +#include +#include #include #include #include @@ -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);