| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
Needed by the QtCreator CMake port.
Change-Id: I7ff9405f80f2e96f5988429a42e695627a884b30
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
|
|
|
|
|
|
|
|
| |
This is a library, so the defaults should be fine.
Change-Id: I03a663ce62a8f2604ed01454cb5824a4d341c080
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
|
|
|
|
|
| |
Change-Id: I46c21c8fe8a3cc36484c3b9c8668add38f89db36
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
this fixes static builds by ensuring that all dependencies are exported.
Task-number: QTBUG-51071
Change-Id: I97269045b2e51af47aa9eea8ac7e291ac3c03ab1
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Commit 773dd01 in qtbase introduced a general mingw platform scope, which
is cleaner and more flexible than matching the spec name.
(see 278152fff for a similar commit in qtbase).
Change-Id: Ia374dd565469750efed2b537e48c651fc3af8cb5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|
|
|
|
|
|
|
| |
it doesn't actually do anything useful for quite a while
Change-Id: Ibe52bd7408227655ae8295d78823105163385897
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
|
| |
the centralized code handles it just fine
Task-number: QTBUG-28633
Change-Id: I46105ab301869dec807fdc4ca5fe5e563bc217b9
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Ensure QT_DESIGNER_STATIC is defined everywhere such that
the EXPORT macros evaluate to empty.
Task-number: QTBUG-28131
Change-Id: I111b1351c4d81172adc9110d31b8b7ed13af7ef5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
| |
Change-Id: Ifbef0323f3a3fc80b10ac2c8c8a8a68ce646c1e6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
MinGW GCC cc1plus crashes when precompile_header is used. This has been
observed with several versions of MinGW GCC from MinGW-builds and
MinGW-w64. Disable precompile_header when using win32-g++ mkspec to
avoid the crash.
Change-Id: I538563bf1dc0f45eb9cf0528ad8b95fc0e87b7e8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|
|
|
|
| |
Change-Id: I6f347fc1ee6e3319545564dc3eadfe2fd330e25e
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
| |
Change-Id: I20e609469de3cd050fd2ef0dceeefbf424249b44
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
The QCLucene library is obviously internal, and the only headers installed
by QtDesignerComponents are apparently pch headers.
This causes the avoidance of creation of CMake files.
Change-Id: Icb0b7e4ad622af3b2bc37043678dd6dc134be724
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- load(qt_module) => load(qt_build_config)
- remove:
- CONFIG+=module (obsolete)
- setup of PKGCONFIG* variables (automated now)
- code relating to module version headers (automated now)
- %mastercontent assignment (automated now)
- pointless QPRO_PWD assignments
- qmake -project boilerplate
Change-Id: I64ce8134c471ccf674b6815878b4090a7eb8d961
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|
|
|
|
|
| |
Change-Id: I1ba2a287525556fcdc1c0db5a1ef3ade16c12eda
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
| |
Change-Id: Iee4964add76a10027643599bce8f846b1b6d249b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|
|
|
|
|
| |
Change-Id: I351b1437442b65a96e07de6fa633e06f3953c128
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Clean up .pro-files, remove fiddling with libraryTarget.
Change-Id: I81e1b7cf6e2bbafec3a36e56f92e44a83886bb31
Reviewed-on: http://codereview.qt-project.org/5978
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
And it actually runs! ;-)
Change-Id: I593991e3b5d423189f00d1bd9c51daca6b9e9bd0
Reviewed-on: http://codereview.qt-project.org/4831
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Modules have their own variables to use for such things
If there's no way of getting to what you need outside of those,
you probably shouldn't be doing it in the first place.
Change-Id: I3e8d5f632ea377ec5dcb3eb0fe7dd27d2f4deb90
Reviewed-on: http://codereview.qt.nokia.com/1850
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|/ |
|
| |
|
| |
|
| |
|
| |
|
|
This is the beginning of revision history for this module. If you
want to look at revision history older than this, please refer to the
Qt Git wiki for how to use Git history grafting. At the time of
writing, this wiki is located here:
http://qt.gitorious.org/qt/pages/GitIntroductionWithQt
If you have already performed the grafting and you don't see any
history beyond this commit, try running "git log" with the "--follow"
argument.
Branched from the monolithic repo, Qt master branch, at commit
896db169ea224deb96c59ce8af800d019de63f12
|