ms-windows/osgeo4w/creatensis.pl

@@ -164,17 +164,28 @@ sub getDeps {
 my $taropt = "v" x $verbose;
 
 unless(-d $unpacked ) {
-	mkdir $unpacked, 0755;
+	mkdir "$unpacked", 0755;
+	mkdir "$unpacked/bin", 0755;
+	mkdir "$unpacked/etc", 0755;
+	mkdir "$unpacked/etc/setup", 0755;
 
-	foreach my $p ( keys %pkgs ) {
-		$p = $file{$p};
+	# Create package database
+	open O, ">$unpacked/etc/setup/installed.db";
+	print O "INSTALLED.DB 2\n";
+
+	foreach my $pn ( keys %pkgs ) {
+		$p = $file{$pn};
 		$p =~ s#^.*/#$packages/#;
 
+		print O "$pn $p 0\n";
+
 		print "Unpacking $p...\n" if $verbose;
-		system "tar $taropt -C $unpacked -xjf $p";
+		system "tar $taropt -C $unpacked -xjvf $p | gzip -c >$unpacked/etc/setup/$pn.lst.gz";
 		die "unpacking of $p failed" if $?;
 	}
 
+	close O;
+
 	chdir $unpacked;
 
 	mkdir "bin", 0755;

src/gui/qgsrelationadddlg.cpp

@@ -5,6 +5,12 @@ QgsRelationAddDlg::QgsRelationAddDlg( QWidget *parent ) :
     QDialog( parent )
 {
   setupUi( this );
+
+#if QT_VERSION >= 0x40700
+  mTxtRelationId->setPlaceholderText( tr( "[Generated automatically]" ) );
+#else
+  mTxtRelationId->setToolTip( tr( "[Generated automatically]" ) );
+#endif
 }
 
 void QgsRelationAddDlg::addLayers( QList< QgsVectorLayer* > layers )

src/ui/qgsrelationadddlgbase.ui

@@ -80,9 +80,6 @@
    </item>
    <item row="8" column="1">
     <widget class="QLineEdit" name="mTxtRelationId">
-     <property name="placeholderText">
-      <string>[Generated automatically]</string>
-     </property>
     </widget>
    </item>
    <item row="1" column="1">