OSDN Git Service

Make Components installable. Fix Shadow Build.
authorDaniel Molkentin <daniel.molkentin@nokia.com>
Tue, 2 Aug 2011 15:11:29 +0000 (17:11 +0200)
committerEike Ziller <eike.ziller@nokia.com>
Wed, 3 Aug 2011 14:12:35 +0000 (16:12 +0200)
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:
lib/qtcreator/qtcomponents/Button.qml [moved from share/qtcreator/welcomescreen/components/Button.qml with 100% similarity]
lib/qtcreator/qtcomponents/ButtonRow.qml [moved from share/qtcreator/welcomescreen/components/ButtonRow.qml with 100% similarity]
lib/qtcreator/qtcomponents/CheckBox.qml [moved from share/qtcreator/welcomescreen/components/CheckBox.qml with 100% similarity]
lib/qtcreator/qtcomponents/ChoiceList.qml [moved from share/qtcreator/welcomescreen/components/ChoiceList.qml with 100% similarity]
lib/qtcreator/qtcomponents/ContextMenu.qml [moved from share/qtcreator/welcomescreen/components/ContextMenu.qml with 100% similarity]
lib/qtcreator/qtcomponents/Dial.qml [moved from share/qtcreator/welcomescreen/components/Dial.qml with 100% similarity]
lib/qtcreator/qtcomponents/Frame.qml [moved from share/qtcreator/welcomescreen/components/Frame.qml with 100% similarity]
lib/qtcreator/qtcomponents/GroupBox.qml [moved from share/qtcreator/welcomescreen/components/GroupBox.qml with 100% similarity]
lib/qtcreator/qtcomponents/Menu.qml [moved from share/qtcreator/welcomescreen/components/Menu.qml with 100% similarity]
lib/qtcreator/qtcomponents/MenuItem.qml [moved from share/qtcreator/welcomescreen/components/MenuItem.qml with 100% similarity]
lib/qtcreator/qtcomponents/ProgressBar.qml [moved from share/qtcreator/welcomescreen/components/ProgressBar.qml with 100% similarity]
lib/qtcreator/qtcomponents/RadioButton.qml [moved from share/qtcreator/welcomescreen/components/RadioButton.qml with 100% similarity]
lib/qtcreator/qtcomponents/ScrollArea.qml [moved from share/qtcreator/welcomescreen/components/ScrollArea.qml with 100% similarity]
lib/qtcreator/qtcomponents/ScrollBar.qml [moved from share/qtcreator/welcomescreen/components/ScrollBar.qml with 100% similarity]
lib/qtcreator/qtcomponents/Slider.qml [moved from share/qtcreator/welcomescreen/components/Slider.qml with 100% similarity]
lib/qtcreator/qtcomponents/SpinBox.qml [moved from share/qtcreator/welcomescreen/components/SpinBox.qml with 100% similarity]
lib/qtcreator/qtcomponents/SplitterRow.qml [moved from share/qtcreator/welcomescreen/components/SplitterRow.qml with 100% similarity]
lib/qtcreator/qtcomponents/Switch.qml [moved from share/qtcreator/welcomescreen/components/Switch.qml with 100% similarity]
lib/qtcreator/qtcomponents/Tab.qml [moved from share/qtcreator/welcomescreen/components/Tab.qml with 100% similarity]
lib/qtcreator/qtcomponents/TabBar.qml [moved from share/qtcreator/welcomescreen/components/TabBar.qml with 100% similarity]
lib/qtcreator/qtcomponents/TabFrame.qml [moved from share/qtcreator/welcomescreen/components/TabFrame.qml with 100% similarity]
lib/qtcreator/qtcomponents/TableColumn.qml [moved from share/qtcreator/welcomescreen/components/TableColumn.qml with 100% similarity]
lib/qtcreator/qtcomponents/TableView.qml [moved from share/qtcreator/welcomescreen/components/TableView.qml with 100% similarity]
lib/qtcreator/qtcomponents/TextArea.qml [moved from share/qtcreator/welcomescreen/components/TextArea.qml with 100% similarity]
lib/qtcreator/qtcomponents/TextField.qml [moved from share/qtcreator/welcomescreen/components/TextField.qml with 100% similarity]
lib/qtcreator/qtcomponents/ToolBar.qml [moved from share/qtcreator/welcomescreen/components/ToolBar.qml with 100% similarity]
lib/qtcreator/qtcomponents/ToolButton.qml [moved from share/qtcreator/welcomescreen/components/ToolButton.qml with 100% similarity]
lib/qtcreator/qtcomponents/custom/BasicButton.qml [moved from share/qtcreator/welcomescreen/components/custom/BasicButton.qml with 100% similarity]
lib/qtcreator/qtcomponents/custom/Button.qml [moved from share/qtcreator/welcomescreen/components/custom/Button.qml with 100% similarity]
lib/qtcreator/qtcomponents/custom/ButtonColumn.qml [moved from share/qtcreator/welcomescreen/components/custom/ButtonColumn.qml with 100% similarity]
lib/qtcreator/qtcomponents/custom/ButtonGroup.js [moved from share/qtcreator/welcomescreen/components/custom/ButtonGroup.js with 100% similarity]
lib/qtcreator/qtcomponents/custom/ButtonRow.qml [moved from share/qtcreator/welcomescreen/components/custom/ButtonRow.qml with 100% similarity]
lib/qtcreator/qtcomponents/custom/CheckBox.qml [moved from share/qtcreator/welcomescreen/components/custom/CheckBox.qml with 100% similarity]
lib/qtcreator/qtcomponents/custom/ChoiceList.qml [moved from share/qtcreator/welcomescreen/components/custom/ChoiceList.qml with 100% similarity]
lib/qtcreator/qtcomponents/custom/GroupBox.qml [moved from share/qtcreator/welcomescreen/components/custom/GroupBox.qml with 100% similarity]
lib/qtcreator/qtcomponents/custom/ProgressBar.qml [moved from share/qtcreator/welcomescreen/components/custom/ProgressBar.qml with 100% similarity]
lib/qtcreator/qtcomponents/custom/Slider.qml [moved from share/qtcreator/welcomescreen/components/custom/Slider.qml with 100% similarity]
lib/qtcreator/qtcomponents/custom/SpinBox.qml [moved from share/qtcreator/welcomescreen/components/custom/SpinBox.qml with 100% similarity]
lib/qtcreator/qtcomponents/custom/SplitterRow.qml [moved from share/qtcreator/welcomescreen/components/custom/SplitterRow.qml with 100% similarity]
lib/qtcreator/qtcomponents/custom/TextField.qml [moved from share/qtcreator/welcomescreen/components/custom/TextField.qml with 100% similarity]
lib/qtcreator/qtcomponents/custom/behaviors/ButtonBehavior.qml [moved from share/qtcreator/welcomescreen/components/custom/behaviors/ButtonBehavior.qml with 100% similarity]
lib/qtcreator/qtcomponents/custom/behaviors/ModalPopupBehavior.qml [moved from share/qtcreator/welcomescreen/components/custom/behaviors/ModalPopupBehavior.qml with 100% similarity]
lib/qtcreator/qtcomponents/custom/components.pro [moved from share/qtcreator/welcomescreen/components/custom/components.pro with 100% similarity]
lib/qtcreator/qtcomponents/custom/private/ChoiceListPopup.qml [moved from share/qtcreator/welcomescreen/components/custom/private/ChoiceListPopup.qml with 100% similarity]
lib/qtcreator/qtcomponents/custom/qmldir [moved from share/qtcreator/welcomescreen/components/custom/qmldir with 100% similarity]
lib/qtcreator/qtcomponents/images/folder_new.png [moved from share/qtcreator/welcomescreen/components/images/folder_new.png with 100% similarity]
lib/qtcreator/qtcomponents/qmldir [moved from share/qtcreator/welcomescreen/components/qmldir with 100% similarity]
lib/qtcreator/qtcomponents/qtcomponents.pro [new file with mode: 0644]
qtcreator.pro
share/qtcreator/welcomescreen/components/components.pro [deleted file]
share/qtcreator/welcomescreen/components/styleitem/styleitem.pro [deleted file]
share/qtcreator/welcomescreen/develop.qml
share/qtcreator/welcomescreen/welcomescreen.pro [deleted file]
share/qtcreator/welcomescreen/welcomescreen.qml
share/qtcreator/welcomescreen/widgets/Button.qml
share/qtcreator/welcomescreen/widgets/CheckBox.qml
share/qtcreator/welcomescreen/widgets/ExampleBrowser.qml
share/qtcreator/welcomescreen/widgets/ExampleDelegate.qml
share/qtcreator/welcomescreen/widgets/FeaturedAndNewsListing.qml
share/qtcreator/welcomescreen/widgets/Feedback.qml
share/qtcreator/welcomescreen/widgets/LineEdit.qml
share/qtcreator/welcomescreen/widgets/LinksBar.qml
share/qtcreator/welcomescreen/widgets/NewsListing.qml
share/qtcreator/welcomescreen/widgets/RecentProjects.qml
share/qtcreator/welcomescreen/widgets/RecentSessions.qml
share/share.pro
src/libs/libs.pro
src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.cpp [moved from share/qtcreator/welcomescreen/components/styleitem/qdeclarativefolderlistmodel.cpp with 100% similarity]
src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.h [moved from share/qtcreator/welcomescreen/components/styleitem/qdeclarativefolderlistmodel.h with 100% similarity]
src/libs/qtcomponents/styleitem/qrangemodel.cpp [moved from share/qtcreator/welcomescreen/components/styleitem/qrangemodel.cpp with 100% similarity]
src/libs/qtcomponents/styleitem/qrangemodel.h [moved from share/qtcreator/welcomescreen/components/styleitem/qrangemodel.h with 100% similarity]
src/libs/qtcomponents/styleitem/qrangemodel_p.h [moved from share/qtcreator/welcomescreen/components/styleitem/qrangemodel_p.h with 100% similarity]
src/libs/qtcomponents/styleitem/qstyleitem.cpp [moved from share/qtcreator/welcomescreen/components/styleitem/qstyleitem.cpp with 100% similarity]
src/libs/qtcomponents/styleitem/qstyleitem.h [moved from share/qtcreator/welcomescreen/components/styleitem/qstyleitem.h with 100% similarity]
src/libs/qtcomponents/styleitem/qstyleplugin.cpp [moved from share/qtcreator/welcomescreen/components/styleitem/qstyleplugin.cpp with 100% similarity]
src/libs/qtcomponents/styleitem/qstyleplugin.h [moved from share/qtcreator/welcomescreen/components/styleitem/qstyleplugin.h with 100% similarity]
src/libs/qtcomponents/styleitem/qtmenu.cpp [moved from share/qtcreator/welcomescreen/components/styleitem/qtmenu.cpp with 100% similarity]
src/libs/qtcomponents/styleitem/qtmenu.h [moved from share/qtcreator/welcomescreen/components/styleitem/qtmenu.h with 100% similarity]
src/libs/qtcomponents/styleitem/qtmenubar.cpp [moved from share/qtcreator/welcomescreen/components/styleitem/qtmenubar.cpp with 100% similarity]
src/libs/qtcomponents/styleitem/qtmenubar.h [moved from share/qtcreator/welcomescreen/components/styleitem/qtmenubar.h with 100% similarity]
src/libs/qtcomponents/styleitem/qtmenuitem.cpp [moved from share/qtcreator/welcomescreen/components/styleitem/qtmenuitem.cpp with 100% similarity]
src/libs/qtcomponents/styleitem/qtmenuitem.h [moved from share/qtcreator/welcomescreen/components/styleitem/qtmenuitem.h with 100% similarity]
src/libs/qtcomponents/styleitem/qwheelarea.cpp [moved from share/qtcreator/welcomescreen/components/styleitem/qwheelarea.cpp with 100% similarity]
src/libs/qtcomponents/styleitem/qwheelarea.h [moved from share/qtcreator/welcomescreen/components/styleitem/qwheelarea.h with 100% similarity]
src/libs/qtcomponents/styleitem/styleitem.pro [new file with mode: 0644]
src/plugins/welcome/welcomeplugin.cpp

diff --git a/lib/qtcreator/qtcomponents/qtcomponents.pro b/lib/qtcreator/qtcomponents/qtcomponents.pro
new file mode 100644 (file)
index 0000000..9a3dc0e
--- /dev/null
@@ -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
+}
index 6739eb9..35f8c20 100644 (file)
@@ -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 (file)
index 83e0a3d..0000000
+++ /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 (file)
index 25f403a..0000000
+++ /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
index f4e7def..e8241f8 100644 (file)
@@ -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 (file)
index 9728d2a..0000000
+++ /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
index 68f9761..7421e10 100644 (file)
@@ -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
index ff87fad..4c93989 100644 (file)
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 import Qt 4.7
-import "../components/custom" as Custom
+import qtcomponents.custom 1.0 as Custom
 
 Custom.Button {
     id: button
index e61299b..0124c79 100644 (file)
@@ -1,5 +1,5 @@
 import QtQuick 1.0
-import "../components/custom" as Custom
+import qtcomponents.custom 1.0 as Custom
 
 Custom.CheckBox{
     id:checkbox
index e4abd7b..b033135 100644 (file)
@@ -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
index 21106ca..4a5a0c2 100644 (file)
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 import QtQuick 1.0
-import components 1.0 as Components
+import qtcomponents 1.0 as Components
 
 Rectangle {
     id: root
index 9373d6f..7870efa 100644 (file)
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 import QtQuick 1.0
-import components 1.0 as Components
+import qtcomponents 1.0 as Components
 
 Item {
     InsetText {
index d84a151..9fb685d 100644 (file)
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 import QtQuick 1.0
-import components 1.0 as Components
+import qtcomponents 1.0 as Components
 
 Rectangle {
     id: inner_background
index b6e30e9..163db18 100644 (file)
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 import QtQuick 1.0
-import "../components/custom" as Custom
+import qtcomponents.custom 1.0 as Custom
 
 
 Custom.TextField {
index dbf3ce5..8be29fa 100644 (file)
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 import QtQuick 1.0
-import components 1.0 as Components
+import qtcomponents 1.0 as Components
 
 Row {
     id: tabBar
index 033ce7c..98fad95 100644 (file)
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 import QtQuick 1.1
-import components 1.0 as Components
+import qtcomponents 1.0 as Components
 
 Item {
     id: root
index 0c620bb..6ead30a 100644 (file)
@@ -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")
index 03e3d2d..4f99da6 100644 (file)
@@ -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")
index df8f06e..69509a0 100644 (file)
@@ -1,4 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS = qtcreator/static.pro \
-          qtcreator/translations \
-          qtcreator/welcomescreen
+          qtcreator/translations
index f33e687..6b38719 100644 (file)
@@ -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/src/libs/qtcomponents/styleitem/styleitem.pro b/src/libs/qtcomponents/styleitem/styleitem.pro
new file mode 100644 (file)
index 0000000..aa52c88
--- /dev/null
@@ -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
+}
index 85b40f2..9be13f2 100644 (file)
@@ -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);