Commit 9743b436 authored by Daniel Molkentin's avatar Daniel Molkentin Committed by Eike Ziller

Make Components installable. Fix Shadow Build.

Task-Number: QTCREATORBUG-5672
Done-with: Oswald Buddenhagen
Change-Id: I61f8a83205bc338ba12e43b7471eaa957da2b004
Reviewed-on: http://codereview.qt.nokia.com/2451Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: default avatarEike Ziller <eike.ziller@nokia.com>
parent 6c8edcf9
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
}
......@@ -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 \
......
......@@ -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
......
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
......@@ -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
......
......@@ -31,7 +31,7 @@
**************************************************************************/
import Qt 4.7
import "../components/custom" as Custom
import qtcomponents.custom 1.0 as Custom
Custom.Button {
id: button
......
import QtQuick 1.0
import "../components/custom" as Custom
import qtcomponents.custom 1.0 as Custom
Custom.CheckBox{
id:checkbox
......
......@@ -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
......
......@@ -31,7 +31,7 @@
**************************************************************************/
import QtQuick 1.0
import components 1.0 as Components
import qtcomponents 1.0 as Components
Rectangle {
id: root
......
......@@ -31,7 +31,7 @@
**************************************************************************/
import QtQuick 1.0
import components 1.0 as Components
import qtcomponents 1.0 as Components
Item {
InsetText {
......
......@@ -31,7 +31,7 @@
**************************************************************************/
import QtQuick 1.0
import components 1.0 as Components
import qtcomponents 1.0 as Components
Rectangle {
id: inner_background
......
......@@ -31,7 +31,7 @@
**************************************************************************/
import QtQuick 1.0
import "../components/custom" as Custom
import qtcomponents.custom 1.0 as Custom
Custom.TextField {
......
......@@ -31,7 +31,7 @@
**************************************************************************/
import QtQuick 1.0
import components 1.0 as Components
import qtcomponents 1.0 as Components
Row {
id: tabBar
......
......@@ -31,7 +31,7 @@
**************************************************************************/
import QtQuick 1.1
import components 1.0 as Components
import qtcomponents 1.0 as Components
Item {
id: root
......
......@@ -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")
......
......@@ -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")
......
TEMPLATE = subdirs
SUBDIRS = qtcreator/static.pro \
qtcreator/translations \
qtcreator/welcomescreen
qtcreator/translations
......@@ -14,6 +14,7 @@ SUBDIRS = \
qmljs \
glsl \
qmleditorwidgets \
qtcomponents/styleitem \
symbianutils
# Windows: Compile Qt Creator CDB extension if Debugging tools can be detected.
......
......@@ -2,10 +2,10 @@ TEMPLATE = lib
CONFIG += qt plugin
QT += declarative
QT += script
TARGET = styleplugin
include(../../../../../qtcreator.pri)
DESTDIR = $$IDE_DATA_PATH/welcomescreen/components/plugin
include(../../../../qtcreator.pri)
DESTDIR = $$IDE_LIBRARY_PATH/qtcomponents/plugin
OBJECTS_DIR = tmp
MOC_DIR = tmp
......@@ -23,56 +23,12 @@ SOURCES += qtmenu.cpp \
qtmenubar.cpp \
qtmenuitem.cpp \
qrangemodel.cpp \
qstyleplugin.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
!macx {
target.path = /lib/qtcreator/qtcomponents/plugin
INSTALLS += target
}
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment