diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-09-13 20:57:01 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-09-13 20:57:01 +0200 |
| commit | 7f9aac1d910101267c95a75985a71719682e4ad6 (patch) | |
| tree | ab50a2d005bc0921f68dbce36416848a437c3c0d /sync.profile | |
| parent | 4b2d6747b51137fd2fbff83c0232d155552d6332 (diff) | |
| parent | 650dc4fc2856339805a80e3170f4de6ce1003588 (diff) | |
| download | qttools-7f9aac1d910101267c95a75985a71719682e4ad6.tar.gz | |
Merge remote-tracking branch 'origin/refactor' into master
Conflicts:
src/assistant/help/help.pro
src/designer/src/components/formeditor/formwindow.cpp
src/designer/src/components/formeditor/formwindow_dnditem.cpp
src/designer/src/components/formeditor/layout_propertysheet.cpp
src/designer/src/components/formeditor/qdesigner_resource.cpp
src/designer/src/components/lib/lib.pro
src/designer/src/components/signalsloteditor/signalsloteditor.cpp
src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp
src/designer/src/components/widgetbox/widgetbox_dnditem.cpp
src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
src/designer/src/lib/lib.pro
src/designer/src/lib/shared/qdesigner_formbuilder.cpp
src/designer/src/lib/shared/qdesigner_propertysheet.cpp
src/designer/src/lib/shared/shared.pri
src/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro
src/linguist/lupdate/qdeclarative.cpp
src/linguist/shared/profileevaluator.cpp
src/linguist/shared/qph.cpp
src/linguist/shared/ts.cpp
src/qtconfig/mainwindow.cpp
src/shared/qtgradienteditor/qtcolorline.cpp
src/shared/qtgradienteditor/qtgradientwidget.cpp
sync.profile
Change-Id: I53f0ce4efae4179257cbf3aab87e1af12c3aa4ff
Diffstat (limited to 'sync.profile')
| -rw-r--r-- | sync.profile | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sync.profile b/sync.profile index d93d9bdb6..04d9f6813 100644 --- a/sync.profile +++ b/sync.profile @@ -1,31 +1,37 @@ %modules = ( # path to module name map - "QtCLucene" => "$basedir/src/assistant/lib/fulltextsearch", - "QtHelp" => "$basedir/src/assistant/lib", + "QtCLucene" => "$basedir/src/assistant/clucene", + "QtHelp" => "$basedir/src/assistant/help", + "QtUiTools" => "$basedir/src/designer/src/uitools", "QtDesigner" => "$basedir/src/designer/src/lib", + "QtDesignerComponents" => "$basedir/src/designer/src/components/lib", ); %moduleheaders = ( # restrict the module headers to those found in relative path ); %classnames = ( "qtcluceneversion.h" => "QtCLuceneVersion", "qthelpversion.h" => "QtHelpVersion", + "qtuitoolsversion.h" => "QtUiToolsVersion", "qtdesignerversion.h" => "QtDesigner", + "qtdesignercomponentsversion.h" => "QtDesignerComponents", ); %mastercontent = ( "sql" => "#include <QtSql/QtSql>\n", "xml" => "#include <QtXml/QtXml>\n", "network" => "#include <QtNetwork/QtNetwork>\n", "script" => "#include <QtScript/QtScript>\n", - "qt3support" => "#include <Qt3Support/Qt3Support>\n", "declarative" => "#include <QtDeclarative/QtDeclarative>\n", "clucene" => "#include <QtCLucene/QtCLucene>\n", "help" => "#include <QtHelp/QtHelp>\n", "designer" => "#include <QtDesigner/QtDesigner>\n", + "designercomponents" => "#include <QtDesignerComponents/QtDesignerComponents>\n", "uitools" => "#include <QtUiTools/QtUiTools>\n", ); %modulepris = ( "QtCLucene" => "$basedir/modules/qt_clucene.pri", "QtHelp" => "$basedir/modules/qt_help.pri", + "QtUiTools" => "$basedir/modules/qt_uitools.pri", "QtDesigner" => "$basedir/modules/qt_designer.pri", + "QtDesignerComponents" => "$basedir/modules/qt_designercomponents.pri", ); # Module dependencies. # Every module that is required to build this module should have one entry. |