diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 04:24:03 +0100 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 04:24:03 +0100 |
| commit | a2e7ab8926c5e8a4c89bb017bbcacfcfbf43ef25 (patch) | |
| tree | eadedfd873d7684bdec5f4d793ddd96a96beb897 /demos | |
| parent | 1cdaca2823a7c09f377ab205e6424e35febcbf2c (diff) | |
| parent | ca89d8dc944e7af886c3b31c9d23c8957e5667ab (diff) | |
| download | qt4-tools-a2e7ab8926c5e8a4c89bb017bbcacfcfbf43ef25.tar.gz | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (72 commits)
Doc: Enabled the context menu in the spreadsheet demo.
Updated URLs.
Doc: Applied suggestion for an improvement to the foreach documentation.
Doc: Added a note about the lack of standard file copy/paste on X11.
Doc: Fixed the row number for a widget in two parts of the tutorial.
Doc: Fixed typos.
Reduce compiling time of QScriptValue autotest suite on Windows.
Optimize QScriptValue autotest generator.
Set database write behavior to synchronous=OFF and increase page cache.
doc: Fixed some qdoc errors.
Setting ImhHiddenText for NoEcho line edits is not 100% correct, but still way better than fully visible text.
Allow building documentation without all of Qt
Added a documentation for the new enum value in gesture api.
Remove the OBJECTS_DIR variable assignment from some projets in Qt.
Fix compile
qmake/MinGw: Link statically for Qt Creator to be able to detect it.
Enable two fast path for blend_tiled_rgb565
Avoid QString reallocation for smallcaps fonts in Itemizer::generate()
Make QLabel::text a reloadable property
remove non wifi interfaces from being handled.
...
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/qtdemo/qtdemo.pro | 2 | ||||
| -rw-r--r-- | demos/spreadsheet/spreadsheet.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/demos/qtdemo/qtdemo.pro b/demos/qtdemo/qtdemo.pro index 011ea0c416..2a776ace1d 100644 --- a/demos/qtdemo/qtdemo.pro +++ b/demos/qtdemo/qtdemo.pro @@ -3,8 +3,6 @@ TARGET = qtdemo DEMO_DESTDIR = $$QT_BUILD_TREE isEmpty(DEMO_DESTDIR):DEMO_DESTDIR=../.. DESTDIR = $$DEMO_DESTDIR/bin -OBJECTS_DIR = .obj -MOC_DIR = .moc INSTALLS += target sources diff --git a/demos/spreadsheet/spreadsheet.cpp b/demos/spreadsheet/spreadsheet.cpp index 9693f3c047..f2a1738c89 100644 --- a/demos/spreadsheet/spreadsheet.cpp +++ b/demos/spreadsheet/spreadsheet.cpp @@ -70,6 +70,7 @@ SpreadSheet::SpreadSheet(int rows, int cols, QWidget *parent) updateColor(0); setupMenuBar(); setupContents(); + setupContextMenu(); setCentralWidget(table); statusBar(); |