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>

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
+}

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 \

share/qtcreator/welcomescreen/components/components.pro

@@ -1,2 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = styleitem

share/qtcreator/welcomescreen/components/styleitem/styleitem.pro

@@ -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

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

share/qtcreator/welcomescreen/welcomescreen.pro

@@ -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

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

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

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

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

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

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 {

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

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 {

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

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

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")

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")

share/share.pro

@@ -1,4 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS = qtcreator/static.pro \
-          qtcreator/translations \
-          qtcreator/welcomescreen
+          qtcreator/translations

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.    

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
+}

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);